Moving customer/pixelpark/foreman02.pixelpark.com.yaml -> customer/pixelpark-puppet...

diff --git a/customer/pixelpark-puppet/foreman02.pixelpark.com.yaml b/customer/pixelpark-puppet/foreman02.pixelpark.com.yaml
new file mode 100644 (file)
index 0000000..a705441
--- /dev/null
+++ b/customer/pixelpark-puppet/foreman02.pixelpark.com.yaml
@@ -0,0 +1,60 @@
+---
+infra::role: base_for_old_systems  # because we don't need xymon
+infra::additional_classes:
+  - accounts
+  - python
+  - infra::profile::apache
+  - apache::mod::passenger
+
+
+apache::mod::passenger::passenger_pool_idle_time: 600
+#apache::mod::passenger::passenger_high_performance: 'On'
+
+infra::profile::apache::pp_vhosts:
+  foreman:
+    servername: foreman.pixelpark.com
+    serveraliases:
+      - foreman01.pixelpark.com
+      - foreman02.pixelpark.com
+    docroot: /var/lib/foreman/public/
+    cert_servername: 'wildcard.pixelpark.com'
+    cert_customer: 'pixelpark'
+    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: '/etc/puppetlabs/puppet/ssl/certs/ca.pem'
+    ssl_verify_client: optional
+    ssl_options:
+      - '+StdEnvVars'
+    passenger_app_root: '/usr/share/foreman'
+    passenger_ruby: /usr/bin/tfm-ruby
+    redirect_dest_non_ssl: https://foreman.pixelpark.com/
+#  puppetboard:
+#    servername: puppetboard.pixelpark.com
+#    cert_servername: 'wildcard.pixelpark.com'
+#    cert_customer: 'pixelpark'
+#    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
+#      processes: 2
+#      threads: 5
+#      display-name: '(wsgi:puppetboard)'
+#    wsgi_script_aliases:
+#      '/': '/var/www/puppetboard/wsgi.py'
+#    redirect_dest_non_ssl: https://puppetboard.pixelpark.com/
+#    directories:
+#      - static:
+#        provider: directory
+#        path: /usr/lib/python2.7/site-packages/puppetboard/static
+#      - python:
+#        provider: directory
+#        path: /usr/lib/python2.7/site-packages/puppetboard
+#    aliases:
+#      - { alias: '/static' , path: '/usr/lib/python2.7/site-packages/puppetboard/static' }
+#      - { alias: '/favicon.ico' , path: '/var/www/puppetboard/favicon.ico' }

diff --git a/customer/pixelpark/foreman02.pixelpark.com.yaml b/customer/pixelpark/foreman02.pixelpark.com.yaml
deleted file mode 100644 (file)
index 072a65d..0000000
--- a/customer/pixelpark/foreman02.pixelpark.com.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-infra::role: base_for_old_systems  # because we don't need xymon
-infra::additional_classes:
-  - accounts
-  - python
-  - infra::profile::postfix
-  - infra::profile::cron
-  - infra::profile::apache
-  - apache::mod::passenger
-
-
-apache::mod::passenger::passenger_pool_idle_time: 600
-#apache::mod::passenger::passenger_high_performance: 'On'
-
-
-
-infra::profile::apache::pp_vhosts:
-  foreman:
-    servername: foreman.pixelpark.com
-    serveraliases:
-      - foreman01.pixelpark.com
-      - foreman02.pixelpark.com
-    docroot: /var/lib/foreman/public/
-    cert_servername: 'wildcard.pixelpark.com'
-    cert_customer: 'pixelpark'
-    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: '/etc/puppetlabs/puppet/ssl/certs/ca.pem'
-    ssl_verify_client: optional
-    ssl_options:
-      - '+StdEnvVars'
-    passenger_app_root: '/usr/share/foreman'
-    passenger_ruby: /usr/bin/tfm-ruby
-    redirect_dest_non_ssl: https://foreman.pixelpark.com/
-#  puppetboard:
-#    servername: puppetboard.pixelpark.com
-#    cert_servername: 'wildcard.pixelpark.com'
-#    cert_customer: 'pixelpark'
-#    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
-#      processes: 2
-#      threads: 5
-#      display-name: '(wsgi:puppetboard)'
-#    wsgi_script_aliases:
-#      '/': '/var/www/puppetboard/wsgi.py'
-#    redirect_dest_non_ssl: https://puppetboard.pixelpark.com/
-#    directories:
-#      - static:
-#        provider: directory
-#        path: /usr/lib/python2.7/site-packages/puppetboard/static
-#      - python:
-#        provider: directory
-#        path: /usr/lib/python2.7/site-packages/puppetboard
-#    aliases:
-#      - { alias: '/static' , path: '/usr/lib/python2.7/site-packages/puppetboard/static' }
-#      - { alias: '/favicon.ico' , path: '/var/www/puppetboard/favicon.ico' }