bmas-typo3 - change docroot user

diff --git a/customer/bmas-typo3/development.yaml b/customer/bmas-typo3/development.yaml
index 0de86766b17cc0c6479ee747c17aaac0c5c92f4f..38d39c92b89b3f73cd13394c5d7e13302018f0e0 100644 (file)
--- a/customer/bmas-typo3/development.yaml
+++ b/customer/bmas-typo3/development.yaml
@@ -90,7 +90,7 @@ infra::profile::typo3::projects:
         auth_require: 'valid-user'
         require:
           - local
-    user: service.typo3
+    user: apache
     mode: '2775'
   unternehmenswertmensch:
     version: '6.2.30'
@@ -112,7 +112,7 @@ infra::profile::typo3::projects:
         auth_digest_algorithm: MD5
         auth_user_file: '/etc/httpd/htdigest'
         auth_require: 'valid-user'
-    user: service.typo3
+    user: apache
     mode: '2775'
   inqacheck:
     version: '6.2.30'
@@ -139,7 +139,7 @@ infra::profile::typo3::projects:
         auth_digest_algorithm: MD5
         auth_user_file: '/etc/httpd/htdigest'
         auth_require: 'valid-user'
-    user: service.typo3
+    user: apache
     mode: '2775'
     rewrites:
       - https:
@@ -170,7 +170,7 @@ infra::profile::typo3::projects:
         auth_digest_algorithm: MD5
         auth_user_file: '/etc/httpd/htdigest'
         auth_require: 'valid-user'
-    user: service.typo3
+    user: apache
     mode: '2775'
     php_admin_value:
       always_populate_raw_post_data: '-1'

diff --git a/customer/bmas-typo3/production.yaml b/customer/bmas-typo3/production.yaml
index be531961988fd8111a88e2679f0fbe48684d9299..2d12ddbf6d86b86a6a2f9efb894eafaf8f039cf3 100644 (file)
--- a/customer/bmas-typo3/production.yaml
+++ b/customer/bmas-typo3/production.yaml
@@ -215,7 +215,7 @@ infra::profile::typo3::projects:
       - location3:
         provider: location
         path: '/typo3/sysext/rsaauth/resources/'
-    user: service.typo3
+    user: apache
     mode: '2775'
   unternehmenswertmensch:
     version: '6.2.30'
@@ -251,7 +251,7 @@ infra::profile::typo3::projects:
       - location2:
         provider: location
         path: '/typo3/sysext'
-    user: service.typo3
+    user: apache
     mode: '2775'
   inqacheck:
     version: '6.2.30'
@@ -283,7 +283,7 @@ infra::profile::typo3::projects:
         auth_digest_algorithm: MD5
         auth_user_file: '/etc/httpd/htdigest'
         auth_require: 'valid-user'
-    user: service.typo3
+    user: apache
     mode: '2775'
     php_admin_value:
       memory_limit: 256M
@@ -334,7 +334,7 @@ infra::profile::typo3::projects:
         auth_digest_algorithm: MD5
         auth_user_file: '/etc/httpd/htdigest'
         auth_require: 'valid-user'
-    user: service.typo3
+    user: apache
     mode: '2775'
     php_admin_value:
       memory_limit: 256M
@@ -364,7 +364,7 @@ infra::profile::typo3::projects:
         auth_digest_algorithm: MD5
         auth_user_file: '/etc/httpd/htdigest'
         auth_require: 'valid-user'
-    user: service.typo3
+    user: apache
     mode: '2775'
     php_admin_value:
       memory_limit: 256M
@@ -393,7 +393,7 @@ infra::profile::typo3::projects:
         auth_digest_algorithm: MD5
         auth_user_file: '/etc/httpd/htdigest'
         auth_require: 'valid-user'
-    user: service.typo3
+    user: apache
     mode: '2775'
     rewrites_no_ssl:
       - fis-netzwerk:

diff --git a/customer/bmas-typo3/test.yaml b/customer/bmas-typo3/test.yaml
index ab2f7101f2f7e7c4926160b1532ec3c57f5d3ef9..b8d5fbdf9eefd46d206885299153ce3fad142009 100644 (file)
--- a/customer/bmas-typo3/test.yaml
+++ b/customer/bmas-typo3/test.yaml
@@ -85,7 +85,7 @@ infra::profile::typo3::projects:
         auth_require: 'valid-user'
         require:
           - local
-    user: service.typo3
+    user: apache
     mode: '2775'
   unternehmenswertmensch:
     version: '6.2.30'
@@ -107,7 +107,7 @@ infra::profile::typo3::projects:
         auth_digest_algorithm: MD5
         auth_user_file: '/etc/httpd/htdigest'
         auth_require: 'valid-user'
-    user: service.typo3
+    user: apache
     mode: '2775'
   inqacheck:
     version: '6.2.30'
@@ -134,7 +134,7 @@ infra::profile::typo3::projects:
         auth_digest_algorithm: MD5
         auth_user_file: '/etc/httpd/htdigest'
         auth_require: 'valid-user'
-    user: service.typo3
+    user: apache
     mode: '2775'
     rewrites:
       - https:
@@ -165,7 +165,7 @@ infra::profile::typo3::projects:
         auth_digest_algorithm: MD5
         auth_user_file: '/etc/httpd/htdigest'
         auth_require: 'valid-user'
-    user: service.typo3
+    user: apache
     mode: '2775'
     php_admin_value:
       always_populate_raw_post_data: '-1'
@@ -175,7 +175,7 @@ infra::profile::apache_php::vhosts:
   mikrokredit:
     docroot: /srv/www/mikrokredit
     port: 80
-    docroot_owner: service.typo3
+    docroot_owner: apache
     servername:  test-www-mein-mikrokredit-de.pixelpark.net
     directories:
       - directory_root: