From f2edf550b48a319bb76ee84c95cb94ddcb478c7d Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Wed, 11 Oct 2017 16:18:04 +0200
Subject: [PATCH] Moving customer/pixelpark/puppetmaster01.pixelpark.com.yaml
 -> customer/pixelpark-puppet/puppetmaster01.pixelpark.com.yaml and formating
 it for puppet 5

---
 .../puppetmaster01.pixelpark.com.yaml         | 64 ++++++++++++++-----
 1 file changed, 48 insertions(+), 16 deletions(-)
 rename customer/{pixelpark => pixelpark-puppet}/puppetmaster01.pixelpark.com.yaml (60%)

diff --git a/customer/pixelpark/puppetmaster01.pixelpark.com.yaml b/customer/pixelpark-puppet/puppetmaster01.pixelpark.com.yaml
similarity index 60%
rename from customer/pixelpark/puppetmaster01.pixelpark.com.yaml
rename to customer/pixelpark-puppet/puppetmaster01.pixelpark.com.yaml
index a6c14b49..021ccadd 100644
--- a/customer/pixelpark/puppetmaster01.pixelpark.com.yaml
+++ b/customer/pixelpark-puppet/puppetmaster01.pixelpark.com.yaml
@@ -2,19 +2,21 @@
 infra::role: base
 infra::additional_classes:
   - infra::profile::apache
-  - infra::profile::mcollective::common
-  - infra::profile::postfix
-  - infra::profile::cron
+  # - infra::profile::mcollective::common
   - apache::mod::cgid
 
 accounts::users:
   jenkins:
     apply: true
 
-mcollective::client: false
-mcollective::server: true
-
+# mcollective::client: false
+# mcollective::server: true
 
+sudo::configs:
+  deploy:
+    priority: "06"
+    content: |
+      apache ALL=(ALL) NOPASSWD: /bin/git, /opt/puppetlabs/puppet/bin/r10k, /bin/touch, /usr/bin/curl, /opt/puppetlabs/puppet/bin/curl
 
 #apache::mod::passenger::passenger_max_pool_size: 32
 #apache::mod::passenger::passenger_pool_idle_time: 600
@@ -23,32 +25,62 @@ mcollective::server: true
 #apache::mod::passenger::passenger_ruby: /usr/bin/ruby
 #apache::mod::passenger::passenger_root: /usr/share/ruby/vendor_ruby/phusion_passenger/locations.ini
 
-infra::profile::apache::vhosts:
-  rewrite:
-    port: 80
-    servername: puppetmaster.pixelpark.com
-    serveraliases:
-      - puppetmaster01.pixelpark.com
-    docroot: /var/www/html/
-    redirect_dest: https://foreman.pixelpark.com
+infra::profile::apache::pp_vhosts:
   gitdeploy:
-    port: 8009
     servername: puppetmaster.pixelpark.com
     serveraliases:
       - puppetmaster01.pixelpark.com
+      - puppetmaster02.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: /var/www/cgi-bin
     directories:
       - directory1:
         provider: directory
         path: '/var/www/cgi-bin'
         options:
-          - Indexes
           - FollowSymlinks
           - MultiViews
           - ExecCGI
         addhandlers:
           handler: cgi-script
           extensions: '.py'
+    rewrites:
+      - comment: 'http to https'
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTPS} !=on'
+        rewrite_rule:
+          - '(.*) https://%{literal("%")}{HTTP_HOST}%{literal("%")}{REQUEST_URI} [R=301,L]'
+
+#infra::profile::apache::vhosts:
+#  rewrite:
+#    port: 80
+#    servername: puppetmaster.pixelpark.com
+#    serveraliases:
+#      - puppetmaster01.pixelpark.com
+#    docroot: /var/www/html/
+#    redirect_dest: https://foreman.pixelpark.com
+#  gitdeploy:
+#    port: 8009
+#    servername: puppetmaster.pixelpark.com
+#    serveraliases:
+#      - puppetmaster01.pixelpark.com
+#    docroot: /var/www/cgi-bin
+#    directories:
+#      - directory1:
+#        provider: directory
+#        path: '/var/www/cgi-bin'
+#        options:
+#          - Indexes
+#          - FollowSymlinks
+#          - MultiViews
+#          - ExecCGI
+#        addhandlers:
+#          handler: cgi-script
+#          extensions: '.py'
 #  puppetmaster:
 #    servername: puppetmaster.pixelpark.com
 #    serveraliases:
-- 
2.39.5