Dzahn has submitted this change and it was merged.
Change subject: dumps::zim: fix nginx setup / basic site template
......................................................................
dumps::zim: fix nginx setup / basic site template
Add missing nginx site template for zim dumps to fix
puppet run on francium.
Could not retrieve information from environment production
source(s) puppet:///modules/dumps/nginx.zim.conf
Basic nginx template and fix filename to .erb.
Bug:T94457
Change-Id: I039f147da7773e5a79488489007eea6b5499b568
---
M modules/dumps/manifests/zim.pp
A modules/dumps/templates/nginx.zim.conf.erb
2 files changed, 19 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/dumps/manifests/zim.pp b/modules/dumps/manifests/zim.pp
index a9b8408..4c7dc1a 100644
--- a/modules/dumps/manifests/zim.pp
+++ b/modules/dumps/manifests/zim.pp
@@ -35,7 +35,7 @@
}
nginx::site { 'zim':
- source => 'puppet:///modules/dumps/nginx.zim.conf',
+ source => 'puppet:///modules/dumps/nginx.zim.conf.erb',
notify => Service['nginx'],
}
}
diff --git a/modules/dumps/templates/nginx.zim.conf.erb
b/modules/dumps/templates/nginx.zim.conf.erb
new file mode 100644
index 0000000..a66a8c0
--- /dev/null
+++ b/modules/dumps/templates/nginx.zim.conf.erb
@@ -0,0 +1,18 @@
+limit_conn_zone $binary_remote_addr zone=addr:10m;
+
+server {
+ listen [::]:80 default;
+ server_name francium.eqiad.wmnet;
+
+ root /srv/www/htmldumps;
+
+ location / {
+ index index.html index.htm;
+ autoindex on;
+ charset utf-8;
+ limit_rate 2048k;
+ limit_rate_after 1m;
+ limit_conn addr 3;
+ }
+
+}
--
To view, visit https://gerrit.wikimedia.org/r/204636
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I039f147da7773e5a79488489007eea6b5499b568
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
