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

diff --git a/customer/pixelpark-puppet/messageq01.pixelpark.com.yaml b/customer/pixelpark-puppet/messageq01.pixelpark.com.yaml
new file mode 100644 (file)
index 0000000..711dd94
--- /dev/null
+++ b/customer/pixelpark-puppet/messageq01.pixelpark.com.yaml
@@ -0,0 +1,50 @@
+---
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
+#  - infra::profile::mcollective::common
+#  - infra::profile::mcollective::middleware
+#  - rabbitmq
+
+rabbitmq::delete_guest_user: true
+rabbitmq::package_provider: yum
+rabbitmq::repos_ensure: true
+rabbitmq::ssl: true
+rabbitmq::stomp_ensure: true
+rabbitmq::config_stomp: true
+rabbitmq::stomp_port: 61613
+rabbitmq::ssl_stomp_port: 61614
+rabbitmq::management_ssl: false
+rabbitmq::config_variables:
+  reverse_dns_lookups: true
+rabbitmq::ssl_versions: ['tlsv1.2', 'tlsv1.1', 'tlsv1']
+#rabbitmq::ssl_cert: /etc/rabbitmq/ssl/wildcard.pixelpark.com-cert.pem
+#rabbitmq::ssl_key: /etc/rabbitmq/ssl/wildcard.pixelpark.com-key.pem
+#rabbitmq::ssl_cacert: /etc/rabbitmq/ssl/wildcard.pixelpark.com-ca.pem
+
+rabbitmq::ssl_cert: "/etc/puppetlabs/puppet/ssl/certs/%{fqdn}.pem"
+rabbitmq::ssl_key: "/etc/puppetlabs/puppet/ssl/private_keys/%{fqdn}.pem"
+rabbitmq::ssl_cacert: '/etc/puppetlabs/puppet/ssl/certs/ca.pem'
+
+infra::profile::mcollective::middleware::middleware_admin_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQhq14SLl4sOEMuIQrr/C4hQcUytStmX7J4VNkkquOHG7TiApBIXJANVvizwffDTW0o8hdcP+wXwD+6ZWD6hNpGBPSsoJqzUIyhlYs+mWPsmhymRgIVsAGYaNeynT1jfR4vBNH+mli8c1N4V7WVY4Z6QfSOr0OV+/Q2Iyg3KdkjJ8GChQIZGV4hjPKJmMBkH2oOWucbb8zxnIw8A/U18RIwf7EPTqoY+XCgYe5UG2kpy6OsWqAq7c6+r80vqc8IQGVvPqzMmd/wNNsbhWTsQO7KTArLJp3B4sAJzQa3hel+id3eMp0VlXQkTlgSD7JqtpB0YTb/IhwgAzXZ5PIn/4xDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDUIUJX1Et6IZ2I6qDpyHrvgCDjjA10thdhvKI5cnynMm15+Rlp+0u42FAJdRzTYmab3Q==]
+# Password fuer MCollective Channel
+infra::profile::mcollective::middleware::middleware_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbiONpIROd+0gOLwd9g3YrG8rbKs9IE3XRVvbkolYM06y8ViFEawJZHrg8BhguIuxEPQAqXPNWdbrCiPrTI50tItmtlPIWfkoI32fcOH6Ztxio/iQceYbm77K5eRqkB6S+MBPB9NDu5g6JWscy5B6UKQwezZ+KOsS61BzvoCGEEi9DTj/0Z0QPA3lVil+m3YVMMJyqaS97l2Vho2gXbQMZRiI5zXzYvJQRk90gDenAkeqmNU6w68qcyNCUZPEuPn9S+4TjZRCEWIRld1dNHnfyAdg90G/pXT/HhS1JSixblgn2Hokn4b2zMtQPwDiBjDRUOWUfCgMRIjvLAn/8IbcUjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCqEp+afH5LF7D0Z3g5PSs2gCBh4LwHt9Q9UFCF0OM6yikhfmSZhs6SusoIUKgAQxxvOA==]
+
+
+infra::profile::apache::pp_vhosts:
+  messageq:
+    servername: messageq01.pixelpark.com
+    serveraliases:
+      - messageq.pixelpark.com
+    docroot: /var/www/html/
+    redirect_dest_non_ssl: https://messageq.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'
+    proxy_dest: http://messageq.pixelpark.com:15672
+    rewrites_non_ssl:
+      - comment: 'HTTPS Rewrite'
+        rewrite_rule:
+          - '^(.*)$ https://messageq.pixelpark.com$1 [L,R=301]'

diff --git a/customer/pixelpark/messageq01.pixelpark.com.yaml b/customer/pixelpark/messageq01.pixelpark.com.yaml
deleted file mode 100644 (file)
index bfd97a5..0000000
--- a/customer/pixelpark/messageq01.pixelpark.com.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
----
-infra::role: base
-infra::additional_classes:
-  - infra::profile::apache
-  - infra::profile::postfix
-  - infra::profile::cron
-#  - infra::profile::mcollective::common
-#  - infra::profile::mcollective::middleware
-#  - rabbitmq
-
-rabbitmq::delete_guest_user: true
-rabbitmq::package_provider: yum
-rabbitmq::repos_ensure: true
-rabbitmq::ssl: true
-rabbitmq::stomp_ensure: true
-rabbitmq::config_stomp: true
-rabbitmq::stomp_port: 61613
-rabbitmq::ssl_stomp_port: 61614
-rabbitmq::management_ssl: false
-rabbitmq::config_variables:
-  reverse_dns_lookups: true
-rabbitmq::ssl_versions: ['tlsv1.2', 'tlsv1.1', 'tlsv1']
-#rabbitmq::ssl_cert: /etc/rabbitmq/ssl/wildcard.pixelpark.com-cert.pem
-#rabbitmq::ssl_key: /etc/rabbitmq/ssl/wildcard.pixelpark.com-key.pem
-#rabbitmq::ssl_cacert: /etc/rabbitmq/ssl/wildcard.pixelpark.com-ca.pem
-
-rabbitmq::ssl_cert: "/etc/puppetlabs/puppet/ssl/certs/%{fqdn}.pem"
-rabbitmq::ssl_key: "/etc/puppetlabs/puppet/ssl/private_keys/%{fqdn}.pem"
-rabbitmq::ssl_cacert: '/etc/puppetlabs/puppet/ssl/certs/ca.pem'
-
-infra::profile::mcollective::middleware::middleware_admin_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQhq14SLl4sOEMuIQrr/C4hQcUytStmX7J4VNkkquOHG7TiApBIXJANVvizwffDTW0o8hdcP+wXwD+6ZWD6hNpGBPSsoJqzUIyhlYs+mWPsmhymRgIVsAGYaNeynT1jfR4vBNH+mli8c1N4V7WVY4Z6QfSOr0OV+/Q2Iyg3KdkjJ8GChQIZGV4hjPKJmMBkH2oOWucbb8zxnIw8A/U18RIwf7EPTqoY+XCgYe5UG2kpy6OsWqAq7c6+r80vqc8IQGVvPqzMmd/wNNsbhWTsQO7KTArLJp3B4sAJzQa3hel+id3eMp0VlXQkTlgSD7JqtpB0YTb/IhwgAzXZ5PIn/4xDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDUIUJX1Et6IZ2I6qDpyHrvgCDjjA10thdhvKI5cnynMm15+Rlp+0u42FAJdRzTYmab3Q==]
-# Password fuer MCollective Channel
-infra::profile::mcollective::middleware::middleware_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbiONpIROd+0gOLwd9g3YrG8rbKs9IE3XRVvbkolYM06y8ViFEawJZHrg8BhguIuxEPQAqXPNWdbrCiPrTI50tItmtlPIWfkoI32fcOH6Ztxio/iQceYbm77K5eRqkB6S+MBPB9NDu5g6JWscy5B6UKQwezZ+KOsS61BzvoCGEEi9DTj/0Z0QPA3lVil+m3YVMMJyqaS97l2Vho2gXbQMZRiI5zXzYvJQRk90gDenAkeqmNU6w68qcyNCUZPEuPn9S+4TjZRCEWIRld1dNHnfyAdg90G/pXT/HhS1JSixblgn2Hokn4b2zMtQPwDiBjDRUOWUfCgMRIjvLAn/8IbcUjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCqEp+afH5LF7D0Z3g5PSs2gCBh4LwHt9Q9UFCF0OM6yikhfmSZhs6SusoIUKgAQxxvOA==]
-
-
-infra::profile::apache::pp_vhosts:
-  messageq:
-    servername: messageq01.pixelpark.com
-    serveraliases:
-      - messageq.pixelpark.com
-    docroot: /var/www/html/
-    redirect_dest_non_ssl: https://messageq.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'
-    proxy_dest: http://messageq.pixelpark.com:15672
-    rewrites_non_ssl:
-      - comment: 'HTTPS Rewrite'
-        rewrite_rule:
-          - '^(.*)$ https://messageq.pixelpark.com$1 [L,R=301]'