fbb-passngr dev/test/prod php settings

diff --git a/customer/fbb-passngr/development.yaml b/customer/fbb-passngr/development.yaml
index f23529414db70900051ee532aef0ec87f646e073..9975642a95be2f75a542f5df9927feee1a571052 100644 (file)
--- a/customer/fbb-passngr/development.yaml
+++ b/customer/fbb-passngr/development.yaml
@@ -1,20 +1,4 @@
 ---
-infra::additional_classes:
-  - infra::profile::apache_php
-
-apache::mod::ssl::ssl_cipher: 'EECDH+AES:EDH+AES:!SHA1:!aNULL@STRENGTH'
-
-repo::remi_php72: true
-
-php::extensions:
-  gd: {}
-  opcache: {}
-  soap: {}
-  mbstring: {}
-  zip: {}
-  xml: {}
-  json: {}
-
 accounts::users:
   markus.baumann:
     apply: true
@@ -40,3 +24,38 @@ sudo::configs:
     priority: "06"
     content: |
       jenkins ALL=(apache) NOPASSWD: ALL
+
+infra::additional_classes:
+  - infra::profile::apache_php
+
+apache::mod::ssl::ssl_cipher: 'EECDH+AES:EDH+AES:!SHA1:!aNULL@STRENGTH'
+
+repo::remi_php72: true
+
+php::extensions:
+  gd: {}
+  opcache: {}
+  soap: {}
+  mbstring: {}
+  zip: {}
+  xml: {}
+  json: {}
+
+php::settings:
+  PHP/memory_limit: 320M
+  PHP/post_max_size: 20M
+  PHP/register_globals: 'Off'
+  PHP/include_path: '.:/opt/app/ZendFramework/library:/opt/app/web'
+  PHP/max_execution_time: 30
+  PHP/max_input_time: 60
+  PHP/output_buffering: 65536
+  PHP/upload_max_filesize: 4M
+  PHP/max_file_uploads: 50
+  PHP/short_open_tag: 'On'
+  PHP/expose_php: 'Off'
+
+infra::profile::apache_php::fpm_pool:
+  symfony:
+    listen_owner: apache
+    listen_group: apache
+    pm_max_children: 20

diff --git a/customer/fbb-passngr/production.yaml b/customer/fbb-passngr/production.yaml
index 9eb2be46a93559f2c211f7f5c36d54b2f76f6d22..f7b73f2739509ce9c1161a20475f58fdddd1e108 100644 (file)
--- a/customer/fbb-passngr/production.yaml
+++ b/customer/fbb-passngr/production.yaml
@@ -1,7 +1,17 @@
 ---
+#users here
+
+sudo::configs:
+  jenkins_rights:
+    priority: "06"
+    content: |
+      jenkins ALL=(apache) NOPASSWD: ALL
+
 infra::additional_classes:
   - infra::profile::apache_php
 
+apache::mod::ssl::ssl_cipher: 'EECDH+AES:EDH+AES:!SHA1:!aNULL@STRENGTH'
+
 repo::remi_php72: true
 
 php::extensions:
@@ -12,3 +22,22 @@ php::extensions:
   zip: {}
   xml: {}
   json: {}
+
+php::settings:
+  PHP/memory_limit: 320M
+  PHP/post_max_size: 20M
+  PHP/register_globals: 'Off'
+  PHP/include_path: '.:/opt/app/ZendFramework/library:/opt/app/web'
+  PHP/max_execution_time: 30
+  PHP/max_input_time: 60
+  PHP/output_buffering: 65536
+  PHP/upload_max_filesize: 4M
+  PHP/max_file_uploads: 50
+  PHP/short_open_tag: 'On'
+  PHP/expose_php: 'Off'
+
+infra::profile::apache_php::fpm_pool:
+  symfony:
+    listen_owner: apache
+    listen_group: apache
+    pm_max_children: 20

diff --git a/customer/fbb-passngr/test.yaml b/customer/fbb-passngr/test.yaml
index 8789e2a42a8c971e1fc696bbae4f83f4b2c0cb4c..6b5193610973a63e738ebc8abab5d3545c654afa 100644 (file)
--- a/customer/fbb-passngr/test.yaml
+++ b/customer/fbb-passngr/test.yaml
@@ -1,18 +1,3 @@
----
-infra::additional_classes:
-  - infra::profile::apache_php
-
-repo::remi_php72: true
-
-php::extensions:
-  gd: {}
-  opcache: {}
-  soap: {}
-  mbstring: {}
-  zip: {}
-  xml: {}
-  json: {}
-
 accounts::users:
   markus.baumann:
     apply: true
@@ -38,3 +23,38 @@ sudo::configs:
     priority: "06"
     content: |
       jenkins ALL=(apache) NOPASSWD: ALL
+
+infra::additional_classes:
+  - infra::profile::apache_php
+
+apache::mod::ssl::ssl_cipher: 'EECDH+AES:EDH+AES:!SHA1:!aNULL@STRENGTH'
+
+repo::remi_php72: true
+
+php::extensions:
+  gd: {}
+  opcache: {}
+  soap: {}
+  mbstring: {}
+  zip: {}
+  xml: {}
+  json: {}
+
+php::settings:
+  PHP/memory_limit: 320M
+  PHP/post_max_size: 20M
+  PHP/register_globals: 'Off'
+  PHP/include_path: '.:/opt/app/ZendFramework/library:/opt/app/web'
+  PHP/max_execution_time: 30
+  PHP/max_input_time: 60
+  PHP/output_buffering: 65536
+  PHP/upload_max_filesize: 4M
+  PHP/max_file_uploads: 50
+  PHP/short_open_tag: 'On'
+  PHP/expose_php: 'Off'
+
+infra::profile::apache_php::fpm_pool:
+  symfony:
+    listen_owner: apache
+    listen_group: apache
+    pm_max_children: 20