more support for Docker container

manifests/init.pp

@@ -6,14 +6,17 @@ class secure_afs_request (
   Enum['present', 'absent'] $ensure = 'present',
   #
   Enum['traditional', 'docker']
-                            $hosting_model = 'traditional',
+                          $hosting_model = 'traditional',
   #
-  String                    $vhost  = 'secure-afs-request.example.com',
+  String                  $vhost        = 'secure-afs-request.example.com',
+  String                  $port         = '443',
+  String                  $server_admin = 'bogus@bogus.bogus',
+  Boolean                 $ssl_enable   = true,
   #
-  Enum['wallet', 'none']    $db_credentials_source = 'wallet',
-  Optional[String]          $db_wallet_name        = undef,
+  Enum['wallet', 'none']  $db_credentials_source = 'wallet',
+  Optional[String]        $db_wallet_name        = undef,
   #
-  Optional[String]          $ldap_wallet_name      = undef,
+  Optional[String]        $ldap_wallet_name      = undef,
 ) {
 
   # Install the software.
@@ -26,8 +29,17 @@ class secure_afs_request (
     require => Package['secure-afs-request-web'],
   }
 
-  # Install the Apache configuration.
-  file { '/etc/apache2/sites-enabled/secure-afs-request.conf':
+  # Install the Apache configuration. If this is a traditional server we
+  # save it as /etc/apache2/sites-enabled/secure-afs-request.conf. If this
+  # is a docker container we put it in
+  # /etc/apache2/sites-enabled/default.conf
+  if ($hosting_model == 'traditional') {
+    $apache_conf_name = 'secure-afs-request.conf'
+  } else {
+    $apache_conf_name = 'default.conf'
+  }
+
+  file { $apache_conf_name:
     ensure  => $ensure,
     content => template('secure_afs_request/etc/apache2/sites-available/secure-afs-request.conf.erb'),
     owner   => 'root',

templates/etc/apache2/sites-available/secure-afs-request.conf.erb

+<%-
+  # We only include the redirect section for traditional hosts.
+  if (@hosting_model == 'traditional') then
+-%>
 <VirtualHost *:80>
   ServerAdmin adamhl@.stanford.edu
   ServerName <%= @vhost %>
@@ -6,22 +10,30 @@
   Redirect / https://<%= @vhost %>/
 </VirtualHost>
 
-<VirtualHost *:443>
-  ServerAdmin adamhl@.stanford.edu
+<%-
+  end
+-%>
+<VirtualHost *:<%= @port %>>
+  ServerAdmin <%= @server_admin %>
   ServerName <%= @vhost %>
 
   DocumentRoot /usr/share/secure-afs-request/cgi-bin
   RedirectMatch "^/$" "/secure-group-request"
 
-  TraceEnable off
   AddHandler cgi-script .cgi .pl
 
+<%-
+  if (@ssl_enable) then
+-%>
   ## SSL
   SSLEngine On
   SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:!MEDIUM:!LOW:!SSLv2:!EXP
   SSLCertificateFile    /etc/ssl/certs/<%= @vhost %>.pem
   SSLCertificateKeyFile /etc/ssl/private/<%= @vhost %>.key
 
+<%-
+  end
+-%>
   ### Shibboleth (SAML) section
   <Location /Shibboleth.sso>
     SetHandler shib