[MediaWiki-commits] [Gerrit] operations/puppet[production]: create a profile for nginx-extras package for dumps

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/400391 )

Change subject: create a profile for nginx-extras package for dumps
......................................................................

create a profile for nginx-extras package for dumps

this lets us move the nginx class decl out of the dumps module

Change-Id: Ifd686141fb0b8392bd888d36976153341e279131
---
M modules/dumps/manifests/web/htmldumps.pp
M modules/dumps/manifests/web/xmldumps.pp
M modules/profile/manifests/dumps/web/htmldumps.pp
A modules/profile/manifests/dumps/web/nginx.pp
M modules/profile/manifests/dumps/web/xmldumps_active.pp
M modules/profile/manifests/dumps/web/xmldumps_fallback.pp
6 files changed, 10 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/91/400391/1

diff --git a/modules/dumps/manifests/web/htmldumps.pp 
b/modules/dumps/manifests/web/htmldumps.pp
index adf6229..d5e95ce 100644
--- a/modules/dumps/manifests/web/htmldumps.pp
+++ b/modules/dumps/manifests/web/htmldumps.pp
@@ -22,12 +22,6 @@
         group  => 'htmldumps-admin',
     }
 
-    # don't know if we want bw limits etc so let's slap 'extras'
-    # on there
-    class { '::nginx':
-        variant => 'extras',
-    }
-
     nginx::site { 'htmldumps':
         content => template('dumps/web/htmldumps/nginx.conf.erb'),
         notify  => Service['nginx'],
diff --git a/modules/dumps/manifests/web/xmldumps.pp 
b/modules/dumps/manifests/web/xmldumps.pp
index 7c7e87e..b4b9a72 100644
--- a/modules/dumps/manifests/web/xmldumps.pp
+++ b/modules/dumps/manifests/web/xmldumps.pp
@@ -17,10 +17,6 @@
         webgroup        => $webgroup,
     }
 
-    class { '::nginx':
-        variant => 'extras',
-    }
-
     $ssl_settings = ssl_ciphersuite('nginx', 'mid', true)
 
     letsencrypt::cert::integrated { 'dumps':
diff --git a/modules/profile/manifests/dumps/web/htmldumps.pp 
b/modules/profile/manifests/dumps/web/htmldumps.pp
index 88d29f0..800eff2 100644
--- a/modules/profile/manifests/dumps/web/htmldumps.pp
+++ b/modules/profile/manifests/dumps/web/htmldumps.pp
@@ -1,4 +1,6 @@
 class profile::dumps::web::htmldumps {
+    require profile::dumps::web::nginx
+
     class {'::dumps::web::htmldumps': htmldumps_server => 
'francium.eqiad.wmnet'}
 
     ferm::service { 'html_dumps_http':
diff --git a/modules/profile/manifests/dumps/web/nginx.pp 
b/modules/profile/manifests/dumps/web/nginx.pp
new file mode 100644
index 0000000..df94d06
--- /dev/null
+++ b/modules/profile/manifests/dumps/web/nginx.pp
@@ -0,0 +1,6 @@
+class profile::dumps::web::nginx {
+    # includes module for bandwidth limits
+    class { '::nginx':
+        variant => 'extras',
+    }
+}
diff --git a/modules/profile/manifests/dumps/web/xmldumps_active.pp 
b/modules/profile/manifests/dumps/web/xmldumps_active.pp
index d7d1260..b785a63 100644
--- a/modules/profile/manifests/dumps/web/xmldumps_active.pp
+++ b/modules/profile/manifests/dumps/web/xmldumps_active.pp
@@ -4,6 +4,7 @@
     $xmldumpsdir = hiera('profile::dumps::xmldumpspublicdir'),
     $miscdatasetsdir = hiera('profile::dumps::miscdumpsdir'),
 ) {
+    require profile::dumps::web::nginx
     class { '::dumpsuser': }
 
     class {'::dumps::web::xmldumps_active':
diff --git a/modules/profile/manifests/dumps/web/xmldumps_fallback.pp 
b/modules/profile/manifests/dumps/web/xmldumps_fallback.pp
index dbe5396..cf00edd 100644
--- a/modules/profile/manifests/dumps/web/xmldumps_fallback.pp
+++ b/modules/profile/manifests/dumps/web/xmldumps_fallback.pp
@@ -4,6 +4,7 @@
     $xmldumpsdir = hiera('profile::dumps::xmldumpspublicdir'),
     $miscdatasetsdir = hiera('profile::dumps::miscdumpsdir'),
 ) {
+    require profile::dumps::web::nginx
     class { '::dumpsuser': }
 
     class {'::dumps::web::xmldumps':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd686141fb0b8392bd888d36976153341e279131
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>

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