diff --git a/templates/refstack_http.vhost.erb b/templates/refstack_http.vhost.erb index 089dd2c..887d402 100644 --- a/templates/refstack_http.vhost.erb +++ b/templates/refstack_http.vhost.erb @@ -1,12 +1,12 @@ -:80> -<% if !!@server_admin %> - ServerAdmin <%= @server_admin %> +:80> +<% if !!scope.lookupvar('::refstack::apache::http::server_admin') %> + ServerAdmin <%= scope.lookupvar('::refstack::apache::http::server_admin') %> <% end %> - ServerName <%= @hostname %> + ServerName <%= scope.lookupvar('::refstack::apache::http::hostname') %> - DocumentRoot <%= @install_www_root %> + DocumentRoot <%= scope.lookupvar('::refstack::apache::http::install_www_root') %> - WSGIDaemonProcess refstack user=<%= @user %> group=<%= @group %> threads=5 + WSGIDaemonProcess refstack user=<%= scope.lookupvar('::refstack::apache::http::user') %> group=<%= scope.lookupvar('::refstack::apache::http::group') %> threads=5 WSGIScriptAlias /api /etc/refstack/app.wsgi WSGIPassAuthorization On LogLevel warn diff --git a/templates/refstack_https.vhost.erb b/templates/refstack_https.vhost.erb index 8bc2dec..c621386 100644 --- a/templates/refstack_https.vhost.erb +++ b/templates/refstack_https.vhost.erb @@ -1,12 +1,12 @@ -:80> - <% if !!@server_admin %> - ServerAdmin <%= @server_admin %> +:80> + <% if !!scope.lookupvar('::refstack::apache::https::server_admin') %> + ServerAdmin <%= scope.lookupvar('::refstack::apache::https::server_admin') %> <% end %> - ServerName <%= @hostname %> + ServerName <%= scope.lookupvar('::refstack::apache::https::hostname') %> - DocumentRoot <%= @install_www_root %> + DocumentRoot <%= scope.lookupvar('::refstack::apache::https::install_www_root') %> - Redirect / https://<%= @hostname %>/ + Redirect / https://<%= scope.lookupvar('::refstack::apache::https::hostname') %>/ LogLevel warn ErrorLog ${APACHE_LOG_DIR}/refstack-error.log @@ -14,11 +14,11 @@ - :443> - <% if !!@server_admin %> - ServerAdmin <%= @server_admin %> + :443> + <% if !!scope.lookupvar('::refstack::apache::https::server_admin') %> + ServerAdmin <%= scope.lookupvar('::refstack::apache::https::server_admin') %> <% end %> - ServerName <%= @hostname %> + ServerName <%= scope.lookupvar('::refstack::apache::https::hostname') %> LogLevel warn ErrorLog ${APACHE_LOG_DIR}/refstack-ssl-error.log @@ -27,10 +27,10 @@ SSLEngine on SSLProtocol All -SSLv2 -SSLv3 - SSLCertificateFile <%= @ssl_cert %> - SSLCertificateKeyFile <%= @ssl_key %> - <% if !!@resolved_ssl_ca %> - SSLCertificateChainFile <%= @resolved_ssl_ca %> + SSLCertificateFile <%= scope.lookupvar('::refstack::apache::https::ssl_cert') %> + SSLCertificateKeyFile <%= scope.lookupvar('::refstack::apache::https::ssl_key') %> + <% if !!scope.lookupvar('::refstack::apache::https::resolved_ssl_ca') %> + SSLCertificateChainFile <%= scope.lookupvar('::refstack::apache::https::resolved_ssl_ca') %> <% end %> @@ -46,9 +46,9 @@ # MSIE 7 and newer should be able to use keepalive BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - DocumentRoot <%= @install_www_root %> + DocumentRoot <%= scope.lookupvar('::refstack::apache::https::install_www_root') %> - WSGIDaemonProcess refstack user=<%= @user %> group=<%= @group %> threads=5 + WSGIDaemonProcess refstack user=<%= scope.lookupvar('::refstack::apache::https::user') %> group=<%= scope.lookupvar('::refstack::apache::https::group') %> threads=5 WSGIScriptAlias /api /etc/refstack/app.wsgi WSGIPassAuthorization On