Test different PHP versions
diff --git a/.kitchen.yml b/.kitchen.yml
index ac0cdc6..748722d 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -37,8 +37,9 @@
suites:
- - name: apache_server
+ - name: <%=ENV['SUITE'] || 'apache_server_php7'%>
provisioner:
pillars-from-files:
- apache.sls: tests/pillar/apache_server.sls
+ apache.sls: tests/pillar/<%=ENV['SUITE'] || 'apache_server_php7'%>.sls
+
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/.travis.yml b/.travis.yml
index 4f34af2..4daa25c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,8 +17,8 @@
- bundle install
env:
- - PLATFORM=trevorj/salty-whales:trusty
- - PLATFORM=trevorj/salty-whales:xenial
+ - PLATFORM=trevorj/salty-whales:trusty SUITE=apache_server_php5
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=apache_server_php7
before_script:
diff --git a/tests/pillar/apache_server_php5.sls b/tests/pillar/apache_server_php5.sls
new file mode 100644
index 0000000..0c75989
--- /dev/null
+++ b/tests/pillar/apache_server_php5.sls
@@ -0,0 +1,77 @@
+apache:
+ server:
+ enabled: true
+ modules:
+ - cgi
+ - php
+ module_php: php5
+ user:
+ cloudlab:
+ enabled: true
+ password: cloudlab
+ htpasswd: cloudlab.htpasswd
+ robots:
+ default:
+ all:
+ disallow:
+ - /
+ site:
+ roundcube:
+ enabled: true
+ type: static
+ name: roundcube
+ root: /usr/share/roundcube
+ robots: default
+ locations:
+ - uri: /admin
+ path: /usr/share/postfixadmin
+ auth:
+ engine: kerberos
+ name: "Kerberos Authentication"
+ require:
+ - "ldap-attribute memberOf='cn=jenkins,cn=groups,cn=accounts,dc=example,dc=eu'"
+ kerberos:
+ realms:
+ - EXAMPLE.EU
+ keytab: /etc/apache2/ipa.keytab
+ service: HTTP
+ method:
+ negotiate: true
+ k5passwd: true
+ ldap:
+ url: "ldaps://idm01.example.eu/dc=example,dc=eu?krbPrincipalName"
+ mech: GSSAPI
+ - uri: /mailman
+ path: /usr/lib/cgi-bin/mailman
+ script: true
+ auth:
+ engine: basic
+ htpasswd: cloudlab.htpasswd
+ - uri: /pipermail
+ path: /var/lib/mailman/archives/public
+ webdav:
+ enabled: true
+ - uri: /images/mailman
+ path: /usr/share/images/mailman
+ host:
+ name: mail.example.com
+ aliases:
+ - mail.example.com
+ - lists.example.com
+ - mail01.example.com
+ - mail01
+ default_mpm: prefork
+ mpm:
+ prefork:
+ enabled: true
+ servers:
+ start: 5
+ spare:
+ min: ${apache:server:mpm:prefork:servers:start}
+ max: 10
+ # Avoid memory leakage by restarting workers every x requests
+ max_requests: 0
+ # Should be 80% of server memory / average memory usage of one worker
+ max_clients: 150
+ # Should be same or more than max clients
+ limit: ${apache:server:mpm:prefork:max_clients}
diff --git a/tests/pillar/apache_server.sls b/tests/pillar/apache_server_php7.sls
similarity index 100%
rename from tests/pillar/apache_server.sls
rename to tests/pillar/apache_server_php7.sls