Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148974
Change subject: WIP Cloudfare
......................................................................
WIP Cloudfare
Change-Id: I2cafb7b6bfc1bb8530e67cf182914aab7411f360
---
A puppet/modules/nginx/files/cloudfare
M puppet/modules/nginx/files/nginx.conf
M puppet/modules/nginx/files/translatewiki.net
M puppet/modules/nginx/manifests/init.pp
4 files changed, 29 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/74/148974/1
diff --git a/puppet/modules/nginx/files/cloudfare
b/puppet/modules/nginx/files/cloudfare
new file mode 100644
index 0000000..eaaf4ed
--- /dev/null
+++ b/puppet/modules/nginx/files/cloudfare
@@ -0,0 +1,21 @@
+# file managed by puppet
+
+set_real_ip_from 199.27.128.0/21;
+set_real_ip_from 173.245.48.0/20;
+set_real_ip_from 103.21.244.0/22;
+set_real_ip_from 103.22.200.0/22;
+set_real_ip_from 103.31.4.0/22;
+set_real_ip_from 141.101.64.0/18;
+set_real_ip_from 108.162.192.0/18;
+set_real_ip_from 190.93.240.0/20;
+set_real_ip_from 188.114.96.0/20;
+set_real_ip_from 197.234.240.0/22;
+set_real_ip_from 198.41.128.0/17;
+set_real_ip_from 162.158.0.0/15;
+set_real_ip_from 104.16.0.0/12;
+set_real_ip_from 2400:cb00::/32;
+set_real_ip_from 2606:4700::/32;
+set_real_ip_from 2803:f800::/32;
+set_real_ip_from 2405:b500::/32;
+set_real_ip_from 2405:8100::/32;
+real_ip_header CF-Connecting-IP;
diff --git a/puppet/modules/nginx/files/nginx.conf
b/puppet/modules/nginx/files/nginx.conf
index 713d1ff..8103ec1 100644
--- a/puppet/modules/nginx/files/nginx.conf
+++ b/puppet/modules/nginx/files/nginx.conf
@@ -22,6 +22,8 @@
include /etc/nginx/mime.types;
default_type application/octet-stream;
+ include /etc/nginx/cloudfare;
+
access_log /var/log/nginx/access.log main;
error_log /var/log/nginx/error.log;
diff --git a/puppet/modules/nginx/files/translatewiki.net
b/puppet/modules/nginx/files/translatewiki.net
index a257aa5..743fc54 100644
--- a/puppet/modules/nginx/files/translatewiki.net
+++ b/puppet/modules/nginx/files/translatewiki.net
@@ -18,7 +18,7 @@
spdy_headers_comp 7;
- server_name translatewiki.net dev.translatewiki.net
sandbox.translatewiki.net;
+ server_name translatewiki.net dev.translatewiki.net
sandbox.translatewiki.net translatewiki.org;
root /www/$host;
location = / {
diff --git a/puppet/modules/nginx/manifests/init.pp
b/puppet/modules/nginx/manifests/init.pp
index e0bc0c7..dbf56ed 100644
--- a/puppet/modules/nginx/manifests/init.pp
+++ b/puppet/modules/nginx/manifests/init.pp
@@ -28,6 +28,10 @@
source => 'puppet:///modules/nginx/mime.types',
}
+ file { '/etc/nginx/cloudfare':
+ source => 'puppet:///modules/nginx/cloudfare',
+ }
+
file { '/etc/nginx/sites-available/translatewiki.net':
source => 'puppet:///modules/nginx/translatewiki.net',
}
@@ -42,7 +46,7 @@
}
file { '/etc/nginx/sites-enabled/translatewiki.org':
- ensure => 'link',
+ ensure => 'absent',
target => '../sites-available/translatewiki.org',
}
--
To view, visit https://gerrit.wikimedia.org/r/148974
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2cafb7b6bfc1bb8530e67cf182914aab7411f360
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
