Dzahn has submitted this change and it was merged.
Change subject: ishmael - retab Apache config template
......................................................................
ishmael - retab Apache config template
Change-Id: Ic0576a510153c58e51c9de25d1954212a8bfca0f
---
M modules/ishmael/templates/apache/ishmael.wikimedia.org.erb
1 file changed, 29 insertions(+), 29 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/ishmael/templates/apache/ishmael.wikimedia.org.erb
b/modules/ishmael/templates/apache/ishmael.wikimedia.org.erb
index 980b13b..20c8277 100644
--- a/modules/ishmael/templates/apache/ishmael.wikimedia.org.erb
+++ b/modules/ishmael/templates/apache/ishmael.wikimedia.org.erb
@@ -5,39 +5,39 @@
NameVirtualHost *:443
<VirtualHost *:443>
- ServerName <%= @site_name %>
- SSLEngine On
- SSLCertificateFile /etc/ssl/private/ishmael.wikimedia.org.pem
- SSLCertificateKeyFile /etc/ssl/private/ishmael.wikimedia.org.key
- SSLCACertificateFile /etc/ssl/certs/RapidSSL_CA.pem
+ ServerName <%= @site_name %>
+ SSLEngine On
+ SSLCertificateFile /etc/ssl/private/ishmael.wikimedia.org.pem
+ SSLCertificateKeyFile /etc/ssl/private/ishmael.wikimedia.org.key
+ SSLCACertificateFile /etc/ssl/certs/RapidSSL_CA.pem
<%= @ssl_settings.join("\n") %>
- DocumentRoot <%= @docroot %>
+ DocumentRoot <%= @docroot %>
- <Directory "<%= @docroot %>">
- Options FollowSymLinks
- SSLRequireSSL
- Options ExecCGI
- DirectoryIndex index.php
- AllowOverride AuthConfig
- Order Allow,Deny
- Allow From All
- AuthName "<%= @auth_name %>"
- AuthType Basic
- AuthBasicProvider ldap
- AuthLDAPBindDN <%= @ldap_binddn %>
- AuthLDAPBindPassword <%= @proxypass %>
- AuthLDAPURL "<%= @ldap_authurl %>"
- <% ldap_groups.each do |group| -%>
- Require ldap-group <%= group %>
- <% end -%>
- </Directory>
+ <Directory "<%= @docroot %>">
+ Options FollowSymLinks
+ SSLRequireSSL
+ Options ExecCGI
+ DirectoryIndex index.php
+ AllowOverride AuthConfig
+ Order Allow,Deny
+ Allow From All
+ AuthName "<%= @auth_name %>"
+ AuthType Basic
+ AuthBasicProvider ldap
+ AuthLDAPBindDN <%= @ldap_binddn %>
+ AuthLDAPBindPassword <%= @proxypass %>
+ AuthLDAPURL "<%= @ldap_authurl %>"
+ <% ldap_groups.each do |group| -%>
+ Require ldap-group <%= group %>
+ <% end -%>
+ </Directory>
</VirtualHost>
<VirtualHost *:80>
- ServerName <%= @site_name %>
- DocumentRoot <%= @docroot %>
+ ServerName <%= @site_name %>
+ DocumentRoot <%= @docroot %>
- RewriteEngine on
- RewriteCond %{SERVER_PORT} !^443$
- RewriteRule ^/(.*)$ https://<%= @site_name %>/$1 [L,R]
+ RewriteEngine on
+ RewriteCond %{SERVER_PORT} !^443$
+ RewriteRule ^/(.*)$ https://<%= @site_name %>/$1 [L,R]
</VirtualHost>
--
To view, visit https://gerrit.wikimedia.org/r/154966
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0576a510153c58e51c9de25d1954212a8bfca0f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
