[MediaWiki-commits] [Gerrit] ores: Add experimental nginx proxy caching - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: ores: Add experimental nginx proxy caching
......................................................................


ores: Add experimental nginx proxy caching

Change-Id: Iab2191205c2fcfc2c78e8f851cc0e191bfcc8507
---
M manifests/role/labsores.pp
M modules/ores/manifests/lb.pp
M modules/ores/templates/lb.nginx.erb
3 files changed, 16 insertions(+), 0 deletions(-)

Approvals:
  Yuvipanda: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/labsores.pp b/manifests/role/labsores.pp
index 31115bc..2aa5b38 100644
--- a/manifests/role/labsores.pp
+++ b/manifests/role/labsores.pp
@@ -5,6 +5,8 @@
 class role::labs::ores::lb(
     $realservers,
 ) {
+    require role::labs::lvm::srv
+
     class { '::ores::lb':
         realservers => $realservers,
     }
diff --git a/modules/ores/manifests/lb.pp b/modules/ores/manifests/lb.pp
index 63a644a..66d9af2 100644
--- a/modules/ores/manifests/lb.pp
+++ b/modules/ores/manifests/lb.pp
@@ -2,6 +2,17 @@
 class ores::lb(
     $realservers,
 ) {
+    file { [
+        '/srv/nginx/',
+        '/srv/nginx/cache',
+        '/srv/nginx/tmp',
+    ]:
+        ensure => directory,
+        owner  => 'www-data',
+        group  => 'www-data',
+        mode   => '0775',
+    }
+
     nginx::site { 'ores-lb':
         content => template('ores/lb.nginx.erb'),
     }
diff --git a/modules/ores/templates/lb.nginx.erb 
b/modules/ores/templates/lb.nginx.erb
index 0d0c882..a9e490b 100644
--- a/modules/ores/templates/lb.nginx.erb
+++ b/modules/ores/templates/lb.nginx.erb
@@ -5,10 +5,13 @@
     <% end %>
 }
 
+proxy_cache_path /srv/nginx/cache/ keys_zone=one:10m;
+proxy_temp_path /srv/nginx/tmp/;
 server {
     listen 80;
 
     location / {
+        proxy_cache one;
         proxy_pass oresweb;
     }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/214909
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iab2191205c2fcfc2c78e8f851cc0e191bfcc8507
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits