add needed ssl-cert variables

diff --git a/customer/bmas-g20/www-g20-bmas.pixelpark.net.yaml b/customer/bmas-g20/www-g20-bmas.pixelpark.net.yaml
index 380b0cd18db48d693d43f4ec1b7c494d0243218d..f757ddec9f58d24a7cfbdf5153d8e673729b37dd 100644 (file)
--- a/customer/bmas-g20/www-g20-bmas.pixelpark.net.yaml
+++ b/customer/bmas-g20/www-g20-bmas.pixelpark.net.yaml
@@ -26,6 +26,8 @@ infra::profile::apache::pp_vhosts:
     serveraliases:
       - g20ewg.org
       - www-g20-bmas.pixelpark.net
+    cert_servername: 'www.g20ewg.org'
+    cert_customer: 'bmas'
     ssl_cert: '/etc/pki/tls/certs/www.g20ewg.org-cert.pem'
     ssl_chain: '/etc/pki/tls/certs/www.g20ewg.org-cert.pem'
     ssl_key: '/etc/pki/tls/private/www.g20ewg.org-key.pem'

diff --git a/customer/pixelpark/bat.pixelpark.net.yaml b/customer/pixelpark/bat.pixelpark.net.yaml
index 142dedd0753c84afd74e14a1cf6ea46531cc9e45..96abf3d0e3904b8f44c150880c80f4266176e7dc 100644 (file)
--- a/customer/pixelpark/bat.pixelpark.net.yaml
+++ b/customer/pixelpark/bat.pixelpark.net.yaml
@@ -21,6 +21,8 @@ infra::profile::mysql_server::databases:
 infra::profile::apache::pp_vhosts:
   openemm2015:
     servername: bat.pixelpark.net
+    cert_servername: 'wildcard.pixelpark.net'
+    cert_customer: 'pixelpark'
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'

diff --git a/customer/pixelpark/foreman01.pixelpark.com.yaml b/customer/pixelpark/foreman01.pixelpark.com.yaml
deleted file mode 100644 (file)
index 025d568..0000000
--- a/customer/pixelpark/foreman01.pixelpark.com.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
----
-infra::role: base
-infra::additional_classes:
-  - infra::profile::apache
-  - apache::mod::passenger 
-
-
-apache::mod::passenger::passenger_pool_idle_time: 600
-#apache::mod::passenger::passenger_high_performance: 'On'
-apache::mod::passenger::passenger_ruby: /usr/bin/ruby193-ruby
-apache::mod::passenger::passenger_root: /usr/lib/ruby/gems/1.8/gems/passenger-4.0.18/lib/phusion_passenger/locations.ini
-
-
-infra::profile::apache::pp_vhosts:
-  foreman:
-    servername: foreman.pixelpark.com
-    serveraliases:
-      - foreman01.pixelpark.com
-    docroot: /var/lib/foreman/public/
-    ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem'
-    ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.com-key.pem'
-    ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem'
-    ssl_ca: '/var/lib/puppet/ssl/certs/ca.pem'
-    ssl_verify_client: optional
-    ssl_options:
-      - '+StdEnvVars'
-    passenger_app_root: '/usr/share/foreman'
-    redirect_dest_non_ssl: https://foreman.pixelpark.com/
-  puppetboard:
-    servername: puppetboard.pixelpark.com
-    ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem'
-    ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.com-key.pem'
-    ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem'
-    wsgi_daemon_process: puppetboard
-    wsgi_process_group: puppetboard
-    wsgi_application_group: "%%{ich-trickse}{GLOBAL}"
-    wsgi_daemon_process_options:
-      user: apache
-      group: apache
-      threads: 5
-    wsgi_script_aliases:
-      '/': '/var/www/html/puppetboard/wsgi.py'
-    redirect_dest_non_ssl: https://puppetboard.pixelpark.com/
-    directories:
-      - static:
-        provider: directory
-        path: /usr/lib/python2.6/site-packages/puppetboard/static
-      - python:
-        provider: directory
-        path: /usr/lib/python2.6/site-packages/puppetboard
-    aliases:
-      - { alias: '/static' , path: '/usr/lib/python2.6/site-packages/puppetboard/static' }
-      - { alias: '/favicon.ico' , path: '/var/www/puppetboard/favicon.ico' }
\ No newline at end of file