opendev
/
puppet-ethercalc
Code Issues Proposed changes

Clean up post-apache move carnage. 

Change-Id: Ieeb8469126d64df75e7fa0fff67618daa6990674
Reviewed-on: https://review.openstack.org/11246
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Monty Taylor 2012-08-12 10:47:51 -07:00 committed by Jenkins
parent 3e769e56a3
commit c0ed8b10f1
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/apache.pp
View File

@ -7,10 +7,10 @@ class etherpad_lite::apache (
include remove_nginx
apache::vhost { $vhost_name:
post => 443,
port => 443,
docroot => 'MEANINGLESS ARGUMENT',
priority => '50',
template => 'etherpadlite/etherpadlite.vhost.erb',
template => 'etherpad_lite/etherpadlite.vhost.erb',
require => File["/etc/ssl/certs/${vhost_name}.pem",
"/etc/ssl/private/${vhost_name}.key"],
ssl => true,
@ -37,22 +37,22 @@ class etherpad_lite::apache (
mode => 0700,
}
file { "/etc/ssl/cert/${vhost_name}.pem":
file { "/etc/ssl/certs/${vhost_name}.pem":
ensure => present,
replace => true,
owner => 'root',
mode => 0600,
content => template('etherpad_lite/eplite.crt.erb'),
require => Apache::Vhost[$vhost_name],
require => File['/etc/ssl/certs'],
}
file { '/etc/ssl/private/${vhost_name}.key':
file { "/etc/ssl/private/${vhost_name}.key":
ensure => present,
replace => true,
owner => 'root',
mode => 0600,
content => template('etherpad_lite/eplite.key.erb'),
require => Apache::Vhost[$vhost_name],
require => File['/etc/ssl/private'],
}
}

28
templates/etherpadlite.vhost.erb
View File

@ -1,31 +1,31 @@
<VirtualHost <%= scope.lookupvar("etherpad_lite::vhost_name") %>:80>
ServerAdmin <%= scope.lookupvar("etherpad_lite::serveradmin") %>
<VirtualHost <%= scope.lookupvar("etherpad_lite::apache::vhost_name") %>:80>
ServerAdmin <%= scope.lookupvar("etherpad_lite::apache::serveradmin") %>
ErrorLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("etherpad_lite::vhost_name") %>-error.log
ErrorLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("etherpad_lite::apache::vhost_name") %>-error.log
LogLevel warn
CustomLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("etherpad_lite::vhost_name") %>-access.log combined
CustomLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("etherpad_lite::apache::vhost_name") %>-access.log combined
Redirect / https://<%= scope.lookupvar("etherpad_lite::vhost_name") %>/
Redirect / https://<%= scope.lookupvar("etherpad_lite::apache::vhost_name") %>/
</VirtualHost>
<IfModule mod_ssl.c>
<VirtualHost <%= scope.lookupvar("etherpad_lite::vhost_name") %>:443>
ServerName <%= scope.lookupvar("etherpad_lite::vhost_name") %>
ServerAdmin <%= scope.lookupvar("etherpad_lite::serveradmin") %>
<VirtualHost <%= scope.lookupvar("etherpad_lite::apache::vhost_name") %>:443>
ServerName <%= scope.lookupvar("etherpad_lite::apache::vhost_name") %>
ServerAdmin <%= scope.lookupvar("etherpad_lite::apache::serveradmin") %>
ErrorLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("etherpad_lite::vhost_name") %>-ssl-error.log
ErrorLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("etherpad_lite::apache::vhost_name") %>-ssl-error.log
LogLevel warn
CustomLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("etherpad_lite::vhost_name") %>-ssl-access.log combined
CustomLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("etherpad_lite::apache::vhost_name") %>-ssl-access.log combined
SSLEngine on
SSLCertificateFile /etc/ssl/certs/<%= scope.lookupvar("etherpad_lite::vhost_name") %>.pem
SSLCertificateKeyFile /etc/ssl/private/<%= scope.lookupvar("etherpad_lite::vhost_name") %>.key
SSLCertificateFile /etc/ssl/certs/<%= scope.lookupvar("etherpad_lite::apache::vhost_name") %>.pem
SSLCertificateKeyFile /etc/ssl/private/<%= scope.lookupvar("etherpad_lite::apache::vhost_name") %>.key
BrowserMatch "MSIE [2-6]" \
nokeepalive ssl-unclean-shutdown \
@ -34,8 +34,8 @@
BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
RewriteEngine on
RewriteCond %{HTTP_HOST} !<%= scope.lookupvar("etherpad_lite::vhost_name") %>
RewriteRule ^.*$ https://<%= scope.lookupvar("etherpad_lite::vhost_name") %>
RewriteCond %{HTTP_HOST} !<%= scope.lookupvar("etherpad_lite::apache::vhost_name") %>
RewriteRule ^.*$ https://<%= scope.lookupvar("etherpad_lite::apache::vhost_name") %>
RewriteRule ^/(.*)$ http://localhost:9001/$1 [P]
ProxyPassReverse / http://localhost:9001/