Renamed customer/pixelpark-dns/systemshare.pixelpark.com.yaml -> customer/pixelpark...

diff --git a/customer/pixelpark-dns/dnsmaster.pp-dns.com.yaml b/customer/pixelpark-dns/dnsmaster.pp-dns.com.yaml
new file mode 100644 (file)
index 0000000..e78cd62
--- /dev/null
+++ b/customer/pixelpark-dns/dnsmaster.pp-dns.com.yaml
@@ -0,0 +1,96 @@
+---
+infra::additional_classes:
+  #- infra::profile::apache
+  - rsyslog::client
+  - infra::profile::logrotate
+
+#####################################################
+# Options for /etc/resolv.conf
+resolv_conf::nameservers:
+  - '217.66.52.10'
+  - '212.91.225.75'
+
+repo::remi_php70: true
+
+infra::profile::apache_php::fpm_pool:
+  systemshare:
+    listen_owner: apache
+    listen_group: apache
+    php_admin_value:
+      upload_max_filesize: 20M
+      post_max_size: 20M
+
+php::extensions:
+  gd: {}
+  pgsql: {}
+  mbstring: {}
+  zip: {}
+  xml: {}
+
+apache::default_vhost: false
+
+infra::profile::apache::htdigest:
+  systemshare:
+    www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAqWJier/Gt5EAM6527A6wFgWYaRDYrCDhztdTqDVMTenBy5S+j8zY06gitODRxCEr3CbsBxx8GK5Fh66FY67Z6frJG0hJQK8qII2BuXJX5/Fj9OjmAjIqov8Rt7AK3toxNQxDt1ylgIFst6CVSNNLcLlRvqJwrRT30/9nRmVtUv9tnSH4m+QxQEG3n4ZthHhgx1zfJ+7Qcn0NNX55uE9XvG6ffAUYRdZm2N8Z7dTDTgNAen3WZFW3RbhmbgNZY4htkpyyK6Oppv1rGq6koLwZPuS4q11hgG6icvWjzqSbEDJHWl3lDk6cNdkepAv6kPXHC397fr3VgUMLt7/Yc+YhKDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBApDAfgAJhCxDLLan6o8dgagBBEVotAvr+dD43/wSXg1GjP]
+#test
+infra::profile::apache::pp_vhosts:
+  systemshare.pixelpark.com:
+    docroot: '/var/www/dns-ui/public_html/'
+    servername: dnsui.pixelpark.com
+    serveraliases:
+      - www.dnsui.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'
+    docroot_owner: apache
+    docroot_group: pixel
+    docroot_mode: '2775'
+    directories:
+      - directory_root:
+        provider: directory
+        path: '/var/www/dns-ui/public_html/'
+        addhandlers:
+          - { handler: "proxy:unix:/var/run/php5-fpm-systemshare.sock|fcgi://./" , extensions: '.php' }
+        options:
+          - FollowSymLinks
+          - MultiViews
+        allow_override:
+          - All
+        directoryindex: index.php index.html
+    rewrites:
+      - https:
+        comment: 'http to https alle anderen '
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTPS} !=on'
+        rewrite_rule:
+          - '(.*) https://%%{ich-trickse}{HTTP_HOST}%%{ich-trickse}{REQUEST_URI} [R=301,L]'
+
+mcollective::rpcauditlogfile: '/var/log/puppetlabs/mcollective/audit.log'
+mcollective::server_logfile: '/var/log/puppetlabs/mcollective/mcollective.log'
+
+ntp::servers:
+  - 'ntps1-0.cs.tu-berlin.de'
+  - 'ntps1-1.cs.tu-berlin.de'
+  - 'ntp0.fau.de'
+  - 'ntp1.fau.de'
+  - 'ntp2.fau.de'
+  - 'ntp3.fau.de'
+
+ntp::preferred_servers:
+  - 'ntp0.fau.de'
+
+ntp::peers:
+  - 'time02.pixelpark.com'
+  - 'time03.pixelpark.com'
+  - 'nb-01.pixelpark.com'
+  - 'nb-02.pixelpark.com'
+
+ntp::logfile: '/var/log/ntp.log'
+
+ntp::restrict:
+  - 'default kod'
+  - '-6 default kod'
+  - '127.0.0.1'
+  - '-6 ::1'

diff --git a/customer/pixelpark-dns/systemshare.pixelpark.com.yaml b/customer/pixelpark-dns/systemshare.pixelpark.com.yaml
deleted file mode 100644 (file)
index a887fd0..0000000
--- a/customer/pixelpark-dns/systemshare.pixelpark.com.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
----
-infra::additional_classes:
-  #- infra::profile::apache
-  - rsyslog::client
-  - infra::profile::logrotate
-
-#####################################################
-# Options for /etc/resolv.conf
-resolv_conf::nameservers:
-  - '217.66.52.10'
-  - '212.91.225.75'
-
-repo::remi_php70: true
-
-infra::profile::apache_php::fpm_pool:
-  systemshare:
-    listen_owner: apache
-    listen_group: apache
-    php_admin_value:
-      upload_max_filesize: 20M
-      post_max_size: 20M
-
-php::extensions:
-  gd: {}
-  pgsql: {}
-  mbstring: {}
-  zip: {}
-  xml: {}
-
-apache::default_vhost: false
-
-infra::profile::apache::htdigest:
-  systemshare:
-    www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAqWJier/Gt5EAM6527A6wFgWYaRDYrCDhztdTqDVMTenBy5S+j8zY06gitODRxCEr3CbsBxx8GK5Fh66FY67Z6frJG0hJQK8qII2BuXJX5/Fj9OjmAjIqov8Rt7AK3toxNQxDt1ylgIFst6CVSNNLcLlRvqJwrRT30/9nRmVtUv9tnSH4m+QxQEG3n4ZthHhgx1zfJ+7Qcn0NNX55uE9XvG6ffAUYRdZm2N8Z7dTDTgNAen3WZFW3RbhmbgNZY4htkpyyK6Oppv1rGq6koLwZPuS4q11hgG6icvWjzqSbEDJHWl3lDk6cNdkepAv6kPXHC397fr3VgUMLt7/Yc+YhKDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBApDAfgAJhCxDLLan6o8dgagBBEVotAvr+dD43/wSXg1GjP]
-#test
-infra::profile::apache::pp_vhosts:
-  systemshare.pixelpark.com:
-    docroot: '/var/www/dns-ui/public_html/'
-    servername: dnsui.pixelpark.com
-    serveraliases:
-      - www.dnsui.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'
-    docroot_owner: apache
-    docroot_group: pixel
-    docroot_mode: '2775'
-    directories:
-      - directory_root:
-        provider: directory
-        path: '/var/www/dns-ui/public_html/'
-        addhandlers:
-          - { handler: "proxy:unix:/var/run/php5-fpm-systemshare.sock|fcgi://./" , extensions: '.php' }
-        options:
-          - FollowSymLinks
-          - MultiViews
-        allow_override:
-          - All
-        directoryindex: index.php index.html
-    rewrites:
-      - https:
-        comment: 'http to https alle anderen '
-        rewrite_cond:
-          - '%%{ich-trickse}{HTTPS} !=on'
-        rewrite_rule:
-          - '(.*) https://%%{ich-trickse}{HTTP_HOST}%%{ich-trickse}{REQUEST_URI} [R=301,L]'
-
-
-
-mcollective::rpcauditlogfile: '/var/log/puppetlabs/mcollective/audit.log'
-mcollective::server_logfile: '/var/log/puppetlabs/mcollective/mcollective.log'
-
-ntp::servers:
-  - 'ntps1-0.cs.tu-berlin.de'
-  - 'ntps1-1.cs.tu-berlin.de'
-  - 'ntp0.fau.de'
-  - 'ntp1.fau.de'
-  - 'ntp2.fau.de'
-  - 'ntp3.fau.de'
-
-ntp::preferred_servers:
-  - 'ntp0.fau.de'
-
-ntp::peers:
-  - 'time02.pixelpark.com'
-  - 'time03.pixelpark.com'
-  - 'nb-01.pixelpark.com'
-  - 'nb-02.pixelpark.com'
-
-ntp::logfile: '/var/log/ntp.log'
-
-ntp::restrict:
-  - 'default kod'
-  - '-6 default kod'
-  - '127.0.0.1'
-  - '-6 ::1'