4ef66c2bee
On puppet 3 an explicit undef value is evaluated as the symbol :undef in ERB templates, while on puppet 4 the explicit undef is evaluated the same as the implicit undef which comes to the nil value in ERB. Check for both values to make both puppet versions happy. Change-Id: Ib4bff7259fea2722f799745d476d1af0c34408d5
28 lines
1.1 KiB
Plaintext
28 lines
1.1 KiB
Plaintext
<VirtualHost *:80>
|
|
<% if ! [nil, :undef].include?(scope.lookupvar("storyboard::application::server_admin")) %>
|
|
ServerAdmin <%= scope.lookupvar("storyboard::application::server_admin") %>
|
|
<% end %>
|
|
ServerName <%= scope.lookupvar("storyboard::application::hostname") %>
|
|
|
|
AllowEncodedSlashes on
|
|
|
|
DocumentRoot <%= scope.lookupvar("storyboard::application::www_root") %>
|
|
|
|
WSGIDaemonProcess storyboard user=<%= scope.lookupvar("storyboard::params::user") %> group=<%= scope.lookupvar("storyboard::params::group") %> threads=5 python-path=/usr/local/lib/python2.7/dist-packages
|
|
WSGIScriptAlias /api /var/lib/storyboard/storyboard.wsgi
|
|
WSGIPassAuthorization On
|
|
|
|
LogLevel warn
|
|
ErrorLog ${APACHE_LOG_DIR}/storyboard-error.log
|
|
CustomLog ${APACHE_LOG_DIR}/storyboard-access.log combined
|
|
|
|
<Directory "<%= scope.lookupvar("storyboard::application::install_root") %>">
|
|
<% if scope.lookupvar("storyboard::application::new_vhost_perms") %>
|
|
Require all granted
|
|
<% else %>
|
|
Order allow,deny
|
|
Allow from all
|
|
<% end %>
|
|
</Directory>
|
|
</VirtualHost>
|