issues
search
ocf
/
puppet
Puppet config for OCF servers and lab machines
https://www.ocf.berkeley.edu/
31
stars
71
forks
source link
Prevent dev app vhosts from being proxied through death
#1400
Closed
Kalissaac
closed
11 months ago
Kalissaac
commented
11 months ago
Counterpart to ocf/etc#519
ocfjenkins[bot]
commented
11 months ago
Errored hosts (0)
Changed hosts (3)
Unaffected hosts (62)
Changed hosts
diff for death.ocf.berkeley.edu, dev-death.ocf.berkeley.edu, vampires.ocf.berkeley.edu
```diff ******************************************* File[/usr/local/bin/build-vhosts] => parameters => content => @@ -394,6 +394,12 @@ # Placed before regular vhosts so they take priority in domain matching # (sometimes hosts have entries in both vhost.conf and vhost-app.conf) + # Filter out dev app vhosts so they don't clobber existing vhost entries + prod_app_vhosts = { + domain: conf + for domain, conf in get_app_vhosts().items() + if 'dev' not in conf['flags'] + } config = build_config( - get_app_vhosts(), + prod_app_vhosts, jinja_env.get_template('vhost-web.jinja'), dev_config=args.dev, ******************************************* ```
Unaffected hosts
``` acid.ocf.berkeley.edu anthrax.ocf.berkeley.edu arsenic.ocf.berkeley.edu asteroid.ocf.berkeley.edu autocrat.ocf.berkeley.edu avalanche.ocf.berkeley.edu bedbugs.ocf.berkeley.edu bermudatriangle.ocf.berkeley.edu bigbang.ocf.berkeley.edu biohazard.ocf.berkeley.edu blackout.ocf.berkeley.edu blight.ocf.berkeley.edu blizzard.ocf.berkeley.edu chaos.ocf.berkeley.edu corruption.ocf.berkeley.edu coup.ocf.berkeley.edu cyanide.ocf.berkeley.edu cyclone.ocf.berkeley.edu dataloss.ocf.berkeley.edu deadlock.ocf.berkeley.edu dementors.ocf.berkeley.edu democracy.ocf.berkeley.edu destruction.ocf.berkeley.edu drought.ocf.berkeley.edu fallingrocks.ocf.berkeley.edu famine.ocf.berkeley.edu firestorm.ocf.berkeley.edu firewhirl.ocf.berkeley.edu flood.ocf.berkeley.edu fraud.ocf.berkeley.edu frostbite.ocf.berkeley.edu gridlock.ocf.berkeley.edu hailstorm.ocf.berkeley.edu hal.ocf.berkeley.edu headcrash.ocf.berkeley.edu heatwave.ocf.berkeley.edu hurricane.ocf.berkeley.edu implosion.ocf.berkeley.edu invasion.ocf.berkeley.edu lethe.ocf.berkeley.edu lightning.ocf.berkeley.edu madcow.ocf.berkeley.edu maelstrom.ocf.berkeley.edu meteorstorm.ocf.berkeley.edu outbreak.ocf.berkeley.edu pestilence.ocf.berkeley.edu plague.ocf.berkeley.edu reaper.ocf.berkeley.edu riptide.ocf.berkeley.edu scurvy.ocf.berkeley.edu segfault.ocf.berkeley.edu sinkhole.ocf.berkeley.edu supernova.ocf.berkeley.edu surge.ocf.berkeley.edu thunder.ocf.berkeley.edu tornado.ocf.berkeley.edu tsunami.ocf.berkeley.edu venom.ocf.berkeley.edu volcano.ocf.berkeley.edu whiteout.ocf.berkeley.edu wildfire.ocf.berkeley.edu windshear.ocf.berkeley.edu ```
Jenkins
Counterpart to ocf/etc#519