basic setup for test-webstats01.pp

diff --git a/customer/pixelpark-piwik/test-webstats01.pixelpark.net.yaml b/customer/pixelpark-piwik/test-webstats01.pixelpark.net.yaml
index 581a951ae03b36ab75c85382fdb1c06b483841d5..8c0f464ad3e2ab0e684c1aef8c5ace2f09fe9013 100644 (file)
--- a/customer/pixelpark-piwik/test-webstats01.pixelpark.net.yaml
+++ b/customer/pixelpark-piwik/test-webstats01.pixelpark.net.yaml
@@ -2,48 +2,44 @@
 accounts::users:
   deploy.vogel:
     apply: true
-    group: nginx
+    group: apache
 
 infra::role: base
 infra::additional_classes:
-  - infra::profile::nginx_php_fpm_server
-#  - infra::profile::mysql_server
-#  - infra::profile::monitoring::mysql
+  - infra::profile::mysql_server
+  - infra::profile::monitoring::mysql
+  - infra::profile::apache_php
 
-infra::profile::nginx_php_fpm_server::upstream:
-  'phpfpm':
-    ensure: present
-    members:
-      - 'localhost:9000'
+  infra::profile::apache::htdigest:
+    testserver:
+      www: 'Passwort setzen'
 
-infra::profile::nginx_php_fpm_server::vhosts:
-  test-webstats01:
-    www_root: '/srv/www/test-webstats01'
-    index_files:
-      - 'index.php'
-      - 'index.html'
-    server_name:
-      - 'test-webstats01.pixelpark.net'
-    rewrite_to_https: true
-    ssl: true
-    ssl_cert: '/etc/ssl/certs/wildcard.pixelpark.net-cert.pem'
-    ssl_key: '/etc/ssl/certs/wildcard.pixelpark.net-cert.pem'
-    client_max_body_size: '32M'
-    use_default_location: false
-    listen_port: 80
-#    auth_basic: 'Server'
-#    auth_basic_user_file: '/etc/nginx/.htpasswd'
-    access_log: '/var/log/nginx/test-webstats01-access_log'
-    error_log: '/var/log/nginx/test-webstats01-error_log'
-    format_log: 'combined'
-    owner: 'deploy.vogel'
-    group: 'nginx'
-    mode: '0640'
-    try_files:
-      - '$uri'
-      - '%uri/'
-      - '/index.php?$args'
-    autoindex: 'on'
+  apache::mpm_module: event
+  infra::profile::apache::pp_vhosts:
+    test-webstats01:
+      servername: test-webstats01.pixelpark.net
+      serveraliases:
+        - www.test-webstats01.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'
+      docroot_owner: apache
+      docroot_group: pixel
+      docroot_mode: '2775'
+      directories:
+        - directory_docroot:
+          provider: 'directory'
+          path: "/srv/www/test-webstats01"
+          addhandlers:
+            - { handler: "proxy:unix:/var/run/php7-fpm-test-webstats01.sock|fcgi://./" , extensions: '.php' }
+          options:
+            - FollowSymLinks
+            - MultiViews
+          allow_override:
+            - All
+          directoryindex: 'index.php index.html'
 
 php::extensions:
   gd: {}