Dzahn has submitted this change and it was merged.
Change subject: openstack: do not have duplicate wikitech Apache config
......................................................................
openstack: do not have duplicate wikitech Apache config
The Apache config templates in "kilo" and "liberty" are identical,
checked with diff.
Move it to the "common" directory and have just one copy of it,
not having to figure out which one is actually in use right now.
Adjust the comment in the file to the correct path.
Change-Id: Ia25e7d551642c347ef7c59f0599554144c28f2ce
---
M modules/openstack/manifests/openstack_manager.pp
R modules/openstack/templates/common/wikitech.wikimedia.org.erb
D modules/openstack/templates/liberty/wikitech.wikimedia.org.erb
3 files changed, 2 insertions(+), 130 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/openstack/manifests/openstack_manager.pp
b/modules/openstack/manifests/openstack_manager.pp
index 534a0f9..0438bc6 100644
--- a/modules/openstack/manifests/openstack_manager.pp
+++ b/modules/openstack/manifests/openstack_manager.pp
@@ -54,7 +54,7 @@
}
apache::site { $webserver_hostname:
- content =>
template("openstack/${$openstack_version}/${webserver_hostname}.erb"),
+ content => template("openstack/common/${webserver_hostname}.erb"),
}
file {
diff --git a/modules/openstack/templates/kilo/wikitech.wikimedia.org.erb
b/modules/openstack/templates/common/wikitech.wikimedia.org.erb
similarity index 97%
rename from modules/openstack/templates/kilo/wikitech.wikimedia.org.erb
rename to modules/openstack/templates/common/wikitech.wikimedia.org.erb
index 6bd747c..57d45d3 100644
--- a/modules/openstack/templates/kilo/wikitech.wikimedia.org.erb
+++ b/modules/openstack/templates/common/wikitech.wikimedia.org.erb
@@ -1,6 +1,6 @@
#####################################################################
### THIS FILE IS MANAGED BY PUPPET
-### puppet:///templates/apache/sites/wikitech.wikimedia.org
+### puppet:///modules/openstack/templates/common/wikitech.wikimedia.org
#####################################################################
# vim: filetype=apache
diff --git a/modules/openstack/templates/liberty/wikitech.wikimedia.org.erb
b/modules/openstack/templates/liberty/wikitech.wikimedia.org.erb
deleted file mode 100644
index 6bd747c..0000000
--- a/modules/openstack/templates/liberty/wikitech.wikimedia.org.erb
+++ /dev/null
@@ -1,128 +0,0 @@
-#####################################################################
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///templates/apache/sites/wikitech.wikimedia.org
-#####################################################################
-# vim: filetype=apache
-
-<VirtualHost *:80>
- ServerAdmin [email protected]
- ServerName <%= @webserver_hostname %>
- ServerAlias <%= @webserver_hostname_aliases %>
-
- DocumentRoot /srv/mediawiki/docroot/wikimedia.org
- <Directory />
- Options FollowSymLinks
- AllowOverride None
- </Directory>
- <Directory /srv/mediawiki/docroot/wikimedia.org>
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
- <IfVersion >= 2.4>
- Require all granted
- </IfVersion>
- <IfVersion < 2.4>
- Order allow,deny
- allow from all
- </IfVersion>
- </Directory>
-
- RewriteEngine on
- RewriteCond %{SERVER_PORT} !^443$
- RewriteRule ^/(.*)$ https://<%= @webserver_hostname %>/$1 [L,R]
-
- ErrorLog /var/log/apache2/error.log
-
- # Possible values include: debug, info, notice, warn, error, crit,
- # alert, emerg.
- LogLevel warn
-
- CustomLog /var/log/apache2/access.log wmf
- ServerSignature Off
-
-</VirtualHost>
-<VirtualHost *:443>
- ServerAdmin [email protected]
- ServerName <%= @webserver_hostname %>
-
- SSLEngine on
- SSLCertificateFile /etc/ssl/localcerts/<%= @certificate %>.crt
- SSLCertificateChainFile /etc/ssl/localcerts/<%= @certificate %>.chain.crt
- SSLCertificateKeyFile /etc/ssl/private/<%= @certificate %>.key
- <%= @ssl_settings.join("\n") %>
-
- RedirectMatch ^/$ https://<%= @webserver_hostname %>/wiki/
-
- RewriteEngine on
- RewriteRule ^/view/(.*)$ https://<%= @webserver_hostname %>/wiki/$1 [L,R]
- RewriteCond %{HTTP_HOST} !^<%= @webserver_hostname.gsub(%r[\.],'\\.') %>
[NC]
- RewriteRule ^/(.*) https://<%= @webserver_hostname %>/$1 [L,R]
-
- DocumentRoot /srv/mediawiki/docroot/wikimedia.org
- <Directory />
- Options FollowSymLinks
- AllowOverride None
- </Directory>
- <Directory /srv/mediawiki/docroot/wikimedia.org>
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
- <IfVersion >= 2.4>
- Require all granted
- </IfVersion>
- <IfVersion < 2.4>
- Order allow,deny
- allow from all
- </IfVersion>
- </Directory>
- <Directory /srv/org/wikimedia/controller/wikis/images>
- php_flag engine off
- <IfVersion >= 2.4>
- Require all granted
- </IfVersion>
- </Directory>
- <Location /server-status>
- SetHandler server-status
- <IfVersion >= 2.4>
- Require host wikitech.wikimedia.org
- </IfVersion>
- <IfVersion < 2.4>
- Order deny,allow
- Deny from all
- Allow from 208.80.154.136
- </IfVersion>
- </Location>
- <Directory /a/backup/public>
- php_flag engine off
- <IfVersion >= 2.4>
- Require host wikitech-static.wikimedia.org
- </IfVersion>
- </Directory>
-
-
- Alias /w/images /srv/org/wikimedia/controller/wikis/images
- Alias /w /srv/mediawiki/docroot/wikimedia.org/w
- Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
- Alias /dumps /a/backup/public
- <% if @realm == "labs" %>
- # Add additional wikis for development
- Alias /w2 /srv/org/wikimedia/controller/wikis/w2
- Alias /wiki2 /srv/org/wikimedia/controller/wikis/w2/index.php
- Alias /w3 /srv/org/wikimedia/controller/wikis/w3
- Alias /wiki3 /srv/org/wikimedia/controller/wikis/w3/index.php
- <% end %>
-
- ErrorDocument 404 /w/404.php
-
- ErrorLog /var/log/apache2/error.log
-
- # Possible values include: debug, info, notice, warn, error, crit,
- # alert, emerg.
- LogLevel warn
-
- CustomLog /var/log/apache2/access.log wmf
- ServerSignature Off
-
- # Beacon requests that are normally handled by Varnish. We don't need these
- # requests to do anything, but they shouldn't show up in the JavaScript
- # error console as errors.
- RedirectMatch 204 beacon/(.*)$
-</VirtualHost>
--
To view, visit https://gerrit.wikimedia.org/r/274402
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia25e7d551642c347ef7c59f0599554144c28f2ce
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
