Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enable http2 for vhosts and nginx #1167

Merged
merged 5 commits into from
Oct 24, 2021
Merged

enable http2 for vhosts and nginx #1167

merged 5 commits into from
Oct 24, 2021

Conversation

singingtelegram
Copy link
Member

@ocfjenkins
Copy link

ocfjenkins bot commented Oct 11, 2021

Errored hosts (4)

Changed hosts (1)

Unaffected hosts (81)

WARNING: Output is too long for a comment, posted to a gist instead: https://gist.github.com/0e9ef14f548e88695e20fd85dd69e7ff

Jenkins

blame poor documentation
@ocfjenkins
Copy link

ocfjenkins bot commented Oct 11, 2021

Errored hosts (0)

Changed hosts (5)

Unaffected hosts (81)


Changed hosts
diff for death.ocf.berkeley.edu
*******************************************
+ Apache::Mod[http2] =>
   parameters =>
     "lib_path": "/usr/lib/apache2/modules",
     "package_ensure": "present"
*******************************************
+ File[/etc/apache2/mods-available/http2.load] =>
   parameters =>
     "backup": "main",
     "content": "LoadModule http2_module /usr/lib/apache2/modules/mod_http2.so\n"...
     "ensure": "file",
     "group": "root",
     "mode": "0644",
     "notify": "Class[Apache::Service]",
     "owner": "root"
*******************************************
+ File[/etc/apache2/mods-enabled/http2.load] =>
   parameters =>
     "backup": "main",
     "ensure": "link",
     "group": "root",
     "mode": "0644",
     "notify": "Class[Apache::Service]",
     "owner": "root",
     "target": "/etc/apache2/mods-available/http2.load"
*******************************************
  File[/opt/share/vhost-web.jinja] =>
   parameters =>
     content =>
      @@ -10,4 +10,5 @@
               SSLCertificateKeyFile {{vhost.ssl.key}}
               SSLCertificateChainFile {{vhost.ssl.chain}}
      +	Protocols h2 http/1.1
           {% endif %}
      _
*******************************************
diff for dev-flood.ocf.berkeley.edu
*******************************************
  Concat::Fragment[dev-irc.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  dev-irc.ocf.berkeley.edu;
*******************************************
  Concat_fragment[dev-irc.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  dev-irc.ocf.berkeley.edu;
*******************************************
  Nginx::Resource::Server[dev-irc.ocf.berkeley.edu] =>
   parameters =>
     http2 =>
      - off
      + on
*******************************************
diff for flood.ocf.berkeley.edu
*******************************************
  Concat::Fragment[irc.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  irc.ocf.berkeley.edu;
*******************************************
  Concat_fragment[irc.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  irc.ocf.berkeley.edu;
*******************************************
  Nginx::Resource::Server[irc.ocf.berkeley.edu] =>
   parameters =>
     http2 =>
      - off
      + on
*******************************************
diff for lightning.ocf.berkeley.edu
*******************************************
  Concat::Fragment[puppet.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  puppet.ocf.berkeley.edu;
*******************************************
  Concat_fragment[puppet.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  puppet.ocf.berkeley.edu;
*******************************************
  Nginx::Resource::Server[puppet.ocf.berkeley.edu] =>
   parameters =>
     http2 =>
      - off
      + on
*******************************************
diff for reaper.ocf.berkeley.edu
*******************************************
  Concat::Fragment[jenkins.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  jenkins.ocf.berkeley.edu;
*******************************************
  Concat_fragment[jenkins.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  jenkins.ocf.berkeley.edu;
*******************************************
  Nginx::Resource::Server[jenkins.ocf.berkeley.edu] =>
   parameters =>
     http2 =>
      - off
      + on
*******************************************
Unaffected hosts
acid.ocf.berkeley.edu
alamo.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
bigbang.ocf.berkeley.edu
bigrip.ocf.berkeley.edu
biohazard.ocf.berkeley.edu
blackout.ocf.berkeley.edu
blight.ocf.berkeley.edu
blizzard.ocf.berkeley.edu
calamity.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
dev-dementors.ocf.berkeley.edu
dev-firestorm.ocf.berkeley.edu
drought.ocf.berkeley.edu
entropy.ocf.berkeley.edu
eruption.ocf.berkeley.edu
failure.ocf.berkeley.edu
fallingrocks.ocf.berkeley.edu
falsevacuum.ocf.berkeley.edu
famine.ocf.berkeley.edu
fire.ocf.berkeley.edu
firestorm.ocf.berkeley.edu
firewhirl.ocf.berkeley.edu
fraud.ocf.berkeley.edu
fukushima.ocf.berkeley.edu
gridlock.ocf.berkeley.edu
hailstorm.ocf.berkeley.edu
heatwave.ocf.berkeley.edu
hellfire.ocf.berkeley.edu
hurricane.ocf.berkeley.edu
invasion.ocf.berkeley.edu
jaws.ocf.berkeley.edu
leprosy.ocf.berkeley.edu
lethe.ocf.berkeley.edu
lockdown.ocf.berkeley.edu
madcow.ocf.berkeley.edu
maelstrom.ocf.berkeley.edu
meteorstorm.ocf.berkeley.edu
nuke.ocf.berkeley.edu
outbreak.ocf.berkeley.edu
pandemic.ocf.berkeley.edu
panic.ocf.berkeley.edu
pestilence.ocf.berkeley.edu
plague.ocf.berkeley.edu
pox.ocf.berkeley.edu
quarantine.ocf.berkeley.edu
riot.ocf.berkeley.edu
riptide.ocf.berkeley.edu
scurvy.ocf.berkeley.edu
segfault.ocf.berkeley.edu
shipwreck.ocf.berkeley.edu
sinkhole.ocf.berkeley.edu
solarflare.ocf.berkeley.edu
supernova.ocf.berkeley.edu
surge.ocf.berkeley.edu
tempest.ocf.berkeley.edu
thunder.ocf.berkeley.edu
tornado.ocf.berkeley.edu
tsunami.ocf.berkeley.edu
typhoon.ocf.berkeley.edu
vampires.ocf.berkeley.edu
venom.ocf.berkeley.edu
volcano.ocf.berkeley.edu
whiteout.ocf.berkeley.edu
wildfire.ocf.berkeley.edu
worm.ocf.berkeley.edu
zombies.ocf.berkeley.edu

Jenkins

@singingtelegram
Copy link
Member Author

singingtelegram commented Oct 11, 2021

This should be a rather painless patch (if things go smoothly).

HTTP/2's benefit is pretty significant especially when there are a lot of resources and the user's network is slow/high-latency.

https://imagekit.io/demo/http2-vs-http1

@ocfjenkins
Copy link

ocfjenkins bot commented Oct 11, 2021

Errored hosts (0)

Changed hosts (5)

Unaffected hosts (81)


Changed hosts
diff for death.ocf.berkeley.edu
*******************************************
+ Apache::Mod[http2] =>
   parameters =>
     "lib_path": "/usr/lib/apache2/modules",
     "package_ensure": "present"
*******************************************
+ File[/etc/apache2/mods-available/http2.load] =>
   parameters =>
     "backup": "main",
     "content": "LoadModule http2_module /usr/lib/apache2/modules/mod_http2.so\n"...
     "ensure": "file",
     "group": "root",
     "mode": "0644",
     "notify": "Class[Apache::Service]",
     "owner": "root"
*******************************************
+ File[/etc/apache2/mods-enabled/http2.load] =>
   parameters =>
     "backup": "main",
     "ensure": "link",
     "group": "root",
     "mode": "0644",
     "notify": "Class[Apache::Service]",
     "owner": "root",
     "target": "/etc/apache2/mods-available/http2.load"
*******************************************
  File[/opt/share/vhost-web.jinja] =>
   parameters =>
     content =>
      @@ -10,4 +10,5 @@
               SSLCertificateKeyFile {{vhost.ssl.key}}
               SSLCertificateChainFile {{vhost.ssl.chain}}
      +        Protocols h2 http/1.1
           {% endif %}
      _
*******************************************
diff for dev-flood.ocf.berkeley.edu
*******************************************
  Concat::Fragment[dev-irc.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  dev-irc.ocf.berkeley.edu;
*******************************************
  Concat_fragment[dev-irc.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  dev-irc.ocf.berkeley.edu;
*******************************************
  Nginx::Resource::Server[dev-irc.ocf.berkeley.edu] =>
   parameters =>
     http2 =>
      - off
      + on
*******************************************
diff for flood.ocf.berkeley.edu
*******************************************
  Concat::Fragment[irc.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  irc.ocf.berkeley.edu;
*******************************************
  Concat_fragment[irc.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  irc.ocf.berkeley.edu;
*******************************************
  Nginx::Resource::Server[irc.ocf.berkeley.edu] =>
   parameters =>
     http2 =>
      - off
      + on
*******************************************
diff for lightning.ocf.berkeley.edu
*******************************************
  Concat::Fragment[puppet.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  puppet.ocf.berkeley.edu;
*******************************************
  Concat_fragment[puppet.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  puppet.ocf.berkeley.edu;
*******************************************
  Nginx::Resource::Server[puppet.ocf.berkeley.edu] =>
   parameters =>
     http2 =>
      - off
      + on
*******************************************
diff for reaper.ocf.berkeley.edu
*******************************************
  Concat::Fragment[jenkins.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  jenkins.ocf.berkeley.edu;
*******************************************
  Concat_fragment[jenkins.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  jenkins.ocf.berkeley.edu;
*******************************************
  Nginx::Resource::Server[jenkins.ocf.berkeley.edu] =>
   parameters =>
     http2 =>
      - off
      + on
*******************************************
Unaffected hosts
acid.ocf.berkeley.edu
alamo.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
bigbang.ocf.berkeley.edu
bigrip.ocf.berkeley.edu
biohazard.ocf.berkeley.edu
blackout.ocf.berkeley.edu
blight.ocf.berkeley.edu
blizzard.ocf.berkeley.edu
calamity.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
dev-dementors.ocf.berkeley.edu
dev-firestorm.ocf.berkeley.edu
drought.ocf.berkeley.edu
entropy.ocf.berkeley.edu
eruption.ocf.berkeley.edu
failure.ocf.berkeley.edu
fallingrocks.ocf.berkeley.edu
falsevacuum.ocf.berkeley.edu
famine.ocf.berkeley.edu
fire.ocf.berkeley.edu
firestorm.ocf.berkeley.edu
firewhirl.ocf.berkeley.edu
fraud.ocf.berkeley.edu
fukushima.ocf.berkeley.edu
gridlock.ocf.berkeley.edu
hailstorm.ocf.berkeley.edu
heatwave.ocf.berkeley.edu
hellfire.ocf.berkeley.edu
hurricane.ocf.berkeley.edu
invasion.ocf.berkeley.edu
jaws.ocf.berkeley.edu
leprosy.ocf.berkeley.edu
lethe.ocf.berkeley.edu
lockdown.ocf.berkeley.edu
madcow.ocf.berkeley.edu
maelstrom.ocf.berkeley.edu
meteorstorm.ocf.berkeley.edu
nuke.ocf.berkeley.edu
outbreak.ocf.berkeley.edu
pandemic.ocf.berkeley.edu
panic.ocf.berkeley.edu
pestilence.ocf.berkeley.edu
plague.ocf.berkeley.edu
pox.ocf.berkeley.edu
quarantine.ocf.berkeley.edu
riot.ocf.berkeley.edu
riptide.ocf.berkeley.edu
scurvy.ocf.berkeley.edu
segfault.ocf.berkeley.edu
shipwreck.ocf.berkeley.edu
sinkhole.ocf.berkeley.edu
solarflare.ocf.berkeley.edu
supernova.ocf.berkeley.edu
surge.ocf.berkeley.edu
tempest.ocf.berkeley.edu
thunder.ocf.berkeley.edu
tornado.ocf.berkeley.edu
tsunami.ocf.berkeley.edu
typhoon.ocf.berkeley.edu
vampires.ocf.berkeley.edu
venom.ocf.berkeley.edu
volcano.ocf.berkeley.edu
whiteout.ocf.berkeley.edu
wildfire.ocf.berkeley.edu
worm.ocf.berkeley.edu
zombies.ocf.berkeley.edu

Jenkins

@ocfjenkins
Copy link

ocfjenkins bot commented Oct 11, 2021

Errored hosts (0)

Changed hosts (5)

Unaffected hosts (81)


Changed hosts
diff for death.ocf.berkeley.edu
*******************************************
+ Apache::Mod[http2] =>
   parameters =>
     "lib_path": "/usr/lib/apache2/modules",
     "package_ensure": "present"
*******************************************
  Apache::Vhost[www] =>
   parameters =>
     custom_fragment =>
      @@ -1,3 +1,4 @@
      _
      +      Protocols h2 http/1.1
             UserDir /services/http/users/
             UserDir disabled root
*******************************************
  Concat::Fragment[www-custom_fragment] =>
   parameters =>
     content =>
      @@ -2,4 +2,5 @@
         ## Custom fragment
      ___
      +      Protocols h2 http/1.1
             UserDir /services/http/users/
             UserDir disabled root
*******************************************
  Concat_fragment[www-custom_fragment] =>
   parameters =>
     content =>
      @@ -2,4 +2,5 @@
         ## Custom fragment
      ___
      +      Protocols h2 http/1.1
             UserDir /services/http/users/
             UserDir disabled root
*******************************************
+ File[/etc/apache2/mods-available/http2.load] =>
   parameters =>
     "backup": "main",
     "content": "LoadModule http2_module /usr/lib/apache2/modules/mod_http2.so\n"...
     "ensure": "file",
     "group": "root",
     "mode": "0644",
     "notify": "Class[Apache::Service]",
     "owner": "root"
*******************************************
+ File[/etc/apache2/mods-enabled/http2.load] =>
   parameters =>
     "backup": "main",
     "ensure": "link",
     "group": "root",
     "mode": "0644",
     "notify": "Class[Apache::Service]",
     "owner": "root",
     "target": "/etc/apache2/mods-available/http2.load"
*******************************************
  File[/opt/share/vhost-web.jinja] =>
   parameters =>
     content =>
      @@ -10,4 +10,5 @@
               SSLCertificateKeyFile {{vhost.ssl.key}}
               SSLCertificateChainFile {{vhost.ssl.chain}}
      +        Protocols h2 http/1.1
           {% endif %}
      _
*******************************************
diff for dev-flood.ocf.berkeley.edu
*******************************************
  Concat::Fragment[dev-irc.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  dev-irc.ocf.berkeley.edu;
*******************************************
  Concat_fragment[dev-irc.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  dev-irc.ocf.berkeley.edu;
*******************************************
  Nginx::Resource::Server[dev-irc.ocf.berkeley.edu] =>
   parameters =>
     http2 =>
      - off
      + on
*******************************************
diff for flood.ocf.berkeley.edu
*******************************************
  Concat::Fragment[irc.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  irc.ocf.berkeley.edu;
*******************************************
  Concat_fragment[irc.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  irc.ocf.berkeley.edu;
*******************************************
  Nginx::Resource::Server[irc.ocf.berkeley.edu] =>
   parameters =>
     http2 =>
      - off
      + on
*******************************************
diff for lightning.ocf.berkeley.edu
*******************************************
  Concat::Fragment[puppet.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  puppet.ocf.berkeley.edu;
*******************************************
  Concat_fragment[puppet.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  puppet.ocf.berkeley.edu;
*******************************************
  Nginx::Resource::Server[puppet.ocf.berkeley.edu] =>
   parameters =>
     http2 =>
      - off
      + on
*******************************************
diff for reaper.ocf.berkeley.edu
*******************************************
  Concat::Fragment[jenkins.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  jenkins.ocf.berkeley.edu;
*******************************************
  Concat_fragment[jenkins.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  jenkins.ocf.berkeley.edu;
*******************************************
  Nginx::Resource::Server[jenkins.ocf.berkeley.edu] =>
   parameters =>
     http2 =>
      - off
      + on
*******************************************
Unaffected hosts
acid.ocf.berkeley.edu
alamo.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
bigbang.ocf.berkeley.edu
bigrip.ocf.berkeley.edu
biohazard.ocf.berkeley.edu
blackout.ocf.berkeley.edu
blight.ocf.berkeley.edu
blizzard.ocf.berkeley.edu
calamity.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
dev-dementors.ocf.berkeley.edu
dev-firestorm.ocf.berkeley.edu
drought.ocf.berkeley.edu
entropy.ocf.berkeley.edu
eruption.ocf.berkeley.edu
failure.ocf.berkeley.edu
fallingrocks.ocf.berkeley.edu
falsevacuum.ocf.berkeley.edu
famine.ocf.berkeley.edu
fire.ocf.berkeley.edu
firestorm.ocf.berkeley.edu
firewhirl.ocf.berkeley.edu
fraud.ocf.berkeley.edu
fukushima.ocf.berkeley.edu
gridlock.ocf.berkeley.edu
hailstorm.ocf.berkeley.edu
heatwave.ocf.berkeley.edu
hellfire.ocf.berkeley.edu
hurricane.ocf.berkeley.edu
invasion.ocf.berkeley.edu
jaws.ocf.berkeley.edu
leprosy.ocf.berkeley.edu
lethe.ocf.berkeley.edu
lockdown.ocf.berkeley.edu
madcow.ocf.berkeley.edu
maelstrom.ocf.berkeley.edu
meteorstorm.ocf.berkeley.edu
nuke.ocf.berkeley.edu
outbreak.ocf.berkeley.edu
pandemic.ocf.berkeley.edu
panic.ocf.berkeley.edu
pestilence.ocf.berkeley.edu
plague.ocf.berkeley.edu
pox.ocf.berkeley.edu
quarantine.ocf.berkeley.edu
riot.ocf.berkeley.edu
riptide.ocf.berkeley.edu
scurvy.ocf.berkeley.edu
segfault.ocf.berkeley.edu
shipwreck.ocf.berkeley.edu
sinkhole.ocf.berkeley.edu
solarflare.ocf.berkeley.edu
supernova.ocf.berkeley.edu
surge.ocf.berkeley.edu
tempest.ocf.berkeley.edu
thunder.ocf.berkeley.edu
tornado.ocf.berkeley.edu
tsunami.ocf.berkeley.edu
typhoon.ocf.berkeley.edu
vampires.ocf.berkeley.edu
venom.ocf.berkeley.edu
volcano.ocf.berkeley.edu
whiteout.ocf.berkeley.edu
wildfire.ocf.berkeley.edu
worm.ocf.berkeley.edu
zombies.ocf.berkeley.edu

Jenkins

Copy link
Member

@jvperrin jvperrin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've got jvperrin@9b75c22 from a while back if it's helpful at all too, although I think you've done most of this already now?

@nikhiljha
Copy link
Member

This is great; thank you!

My main concern is if the http2 module even exists in our apache install. Either way, anything touching vhosts is a pretty major change, so we should definitely test on dev-death. I think @ethanhs brought that one up anyway for the bullseye upgrade (?) so that should be relatively less painful than usual

@ethanhs
Copy link
Member

ethanhs commented Oct 17, 2021

I haven't brought up dev-death yet but we should do that anyway. (Also looks like this needs a rebase on master)

@ocfjenkins
Copy link

ocfjenkins bot commented Oct 20, 2021

Errored hosts (0)

Changed hosts (6)

Unaffected hosts (80)


Changed hosts
diff for death.ocf.berkeley.edu
*******************************************
+ Apache::Mod[http2] =>
   parameters =>
     "lib_path": "/usr/lib/apache2/modules",
     "package_ensure": "present"
*******************************************
  Apache::Vhost[www] =>
   parameters =>
     custom_fragment =>
      @@ -1,3 +1,4 @@
      _
      +      Protocols h2 http/1.1
             UserDir /services/http/users/
             UserDir disabled root
*******************************************
  Concat::Fragment[www-custom_fragment] =>
   parameters =>
     content =>
      @@ -2,4 +2,5 @@
         ## Custom fragment
      ___
      +      Protocols h2 http/1.1
             UserDir /services/http/users/
             UserDir disabled root
*******************************************
  Concat_fragment[www-custom_fragment] =>
   parameters =>
     content =>
      @@ -2,4 +2,5 @@
         ## Custom fragment
      ___
      +      Protocols h2 http/1.1
             UserDir /services/http/users/
             UserDir disabled root
*******************************************
+ File[/etc/apache2/mods-available/http2.load] =>
   parameters =>
     "backup": "main",
     "content": "LoadModule http2_module /usr/lib/apache2/modules/mod_http2.so\n"...
     "ensure": "file",
     "group": "root",
     "mode": "0644",
     "notify": "Class[Apache::Service]",
     "owner": "root"
*******************************************
+ File[/etc/apache2/mods-enabled/http2.load] =>
   parameters =>
     "backup": "main",
     "ensure": "link",
     "group": "root",
     "mode": "0644",
     "notify": "Class[Apache::Service]",
     "owner": "root",
     "target": "/etc/apache2/mods-available/http2.load"
*******************************************
  File[/opt/share/vhost-web.jinja] =>
   parameters =>
     content =>
      @@ -9,4 +9,5 @@
               SSLCertificateFile {{vhost.ssl.bundle}}
               SSLCertificateKeyFile {{vhost.ssl.key}}
      +        Protocols h2 http/1.1
           {% endif %}
      _
*******************************************
diff for dev-flood.ocf.berkeley.edu
*******************************************
  Concat::Fragment[dev-irc.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  dev-irc.ocf.berkeley.edu;
*******************************************
  Concat_fragment[dev-irc.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  dev-irc.ocf.berkeley.edu;
*******************************************
  Nginx::Resource::Server[dev-irc.ocf.berkeley.edu] =>
   parameters =>
     http2 =>
      - off
      + on
*******************************************
diff for fallingrocks.ocf.berkeley.edu
*******************************************
  File[/etc/systemd/system/ftpsync-debian.timer] =>
   parameters =>
     content =>
      @@ -5,5 +5,5 @@
      _
       [Timer]
      -OnCalendar=*-*-* 2/3:30:00
      +OnCalendar=*-*-* 0/6:10:00
      _
       [Install]
*******************************************
  File[/opt/mirrors/project/debian-cd/etc/ftpsync.conf] =>
   parameters =>
     content =>
      @@ -13,8 +13,8 @@
       ## rsync YOURUPSTREAMSERVER::
       ## (You might have to export RSYNC_USER/RSYNC_PASSWORD for this to work)
      -RSYNC_PATH="debian-cd"
      +RSYNC_PATH="debian-cdimage"
      _
       ## The host we mirror from
      -RSYNC_HOST="cdimage.debian.org"
      +RSYNC_HOST="ftp.osuosl.org"
      _
       ## In case we need a user to access the rsync share at our upstream host
*******************************************
  Ocf::Systemd::Timer[ftpsync-debian] =>
   parameters =>
     timer_content =>
      @@ -5,5 +5,5 @@
      _
       [Timer]
      -OnCalendar=*-*-* 2/3:30:00
      +OnCalendar=*-*-* 0/6:10:00
      _
       [Install]
*******************************************
  Ocf_mirrors::Ftpsync[debian-cd] =>
   parameters =>
     rsync_host =>
      - cdimage.debian.org
      + ftp.osuosl.org
     rsync_path =>
      - debian-cd
      + debian-cdimage
*******************************************
  Ocf_mirrors::Ftpsync[debian] =>
   parameters =>
     cron_hour =>
      - 2/3
      + 0/6
     cron_minute =>
      - 30
      + 10
*******************************************
  Ocf_mirrors::Timer[ftpsync-debian] =>
   parameters =>
     hour =>
      - 2/3
      + 0/6
     minute =>
      - 30
      + 10
*******************************************
diff for flood.ocf.berkeley.edu
*******************************************
  Concat::Fragment[irc.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  irc.ocf.berkeley.edu;
*******************************************
  Concat_fragment[irc.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  irc.ocf.berkeley.edu;
*******************************************
  Nginx::Resource::Server[irc.ocf.berkeley.edu] =>
   parameters =>
     http2 =>
      - off
      + on
*******************************************
diff for lightning.ocf.berkeley.edu
*******************************************
  Concat::Fragment[puppet.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  puppet.ocf.berkeley.edu;
*******************************************
  Concat_fragment[puppet.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  puppet.ocf.berkeley.edu;
*******************************************
  Nginx::Resource::Server[puppet.ocf.berkeley.edu] =>
   parameters =>
     http2 =>
      - off
      + on
*******************************************
diff for reaper.ocf.berkeley.edu
*******************************************
  Concat::Fragment[jenkins.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  jenkins.ocf.berkeley.edu;
*******************************************
  Concat_fragment[jenkins.ocf.berkeley.edu-ssl-header] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       # MANAGED BY PUPPET
       server {
      -  listen       *:443 ssl;
      -  listen       [::]:443 ssl ;
      +  listen       *:443 ssl http2;
      +  listen       [::]:443 ssl http2 ;
      _
         server_name  jenkins.ocf.berkeley.edu;
*******************************************
  Nginx::Resource::Server[jenkins.ocf.berkeley.edu] =>
   parameters =>
     http2 =>
      - off
      + on
*******************************************
Unaffected hosts
acid.ocf.berkeley.edu
alamo.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
bigbang.ocf.berkeley.edu
bigrip.ocf.berkeley.edu
biohazard.ocf.berkeley.edu
blackout.ocf.berkeley.edu
blight.ocf.berkeley.edu
blizzard.ocf.berkeley.edu
calamity.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
dev-dementors.ocf.berkeley.edu
dev-firestorm.ocf.berkeley.edu
drought.ocf.berkeley.edu
entropy.ocf.berkeley.edu
eruption.ocf.berkeley.edu
failure.ocf.berkeley.edu
falsevacuum.ocf.berkeley.edu
famine.ocf.berkeley.edu
fire.ocf.berkeley.edu
firestorm.ocf.berkeley.edu
firewhirl.ocf.berkeley.edu
fraud.ocf.berkeley.edu
fukushima.ocf.berkeley.edu
gridlock.ocf.berkeley.edu
hailstorm.ocf.berkeley.edu
heatwave.ocf.berkeley.edu
hellfire.ocf.berkeley.edu
hurricane.ocf.berkeley.edu
invasion.ocf.berkeley.edu
jaws.ocf.berkeley.edu
leprosy.ocf.berkeley.edu
lethe.ocf.berkeley.edu
lockdown.ocf.berkeley.edu
madcow.ocf.berkeley.edu
maelstrom.ocf.berkeley.edu
meteorstorm.ocf.berkeley.edu
nuke.ocf.berkeley.edu
outbreak.ocf.berkeley.edu
pandemic.ocf.berkeley.edu
panic.ocf.berkeley.edu
pestilence.ocf.berkeley.edu
plague.ocf.berkeley.edu
pox.ocf.berkeley.edu
quarantine.ocf.berkeley.edu
riot.ocf.berkeley.edu
riptide.ocf.berkeley.edu
scurvy.ocf.berkeley.edu
segfault.ocf.berkeley.edu
shipwreck.ocf.berkeley.edu
sinkhole.ocf.berkeley.edu
solarflare.ocf.berkeley.edu
supernova.ocf.berkeley.edu
surge.ocf.berkeley.edu
tempest.ocf.berkeley.edu
thunder.ocf.berkeley.edu
tornado.ocf.berkeley.edu
tsunami.ocf.berkeley.edu
typhoon.ocf.berkeley.edu
vampires.ocf.berkeley.edu
venom.ocf.berkeley.edu
volcano.ocf.berkeley.edu
whiteout.ocf.berkeley.edu
wildfire.ocf.berkeley.edu
worm.ocf.berkeley.edu
zombies.ocf.berkeley.edu

Jenkins

Copy link
Member

@ethanhs ethanhs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, you said this has been tested already, right?

@singingtelegram
Copy link
Member Author

Yes.

@singingtelegram singingtelegram merged commit cf9f7ac into master Oct 24, 2021
@nikhiljha nikhiljha deleted the http2 branch October 26, 2021 06:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants