Merge pull request #26 from syphernl/experiment/matrix_checking

[WIP] Matrix checking for all variants

.salt/pillar/top.sls

@@ -1,3 +1,4 @@
 base:
   '*':
     - example
+    - overlay

.salt/pillar/vanilla-apache/example.sls

@@ -0,0 +1 @@
+../../../pillar.example

.salt/pillar/vanilla-apache/overlay.sls

@@ -0,0 +1,16 @@
+###
+# Testing: Apache2 @ Vanilla
+###
+vhosting:
+  lookup:
+    ## For Vanilla
+    webstack: 'vanilla.apache'
+    php_config_dir: '/etc/php5/conf.d'
+    ###
+
+    webserver_config_dir: '/etc/apache2'
+    sites_available: '/etc/apache2/sites-available'
+    sites_enabled: '/etc/apache2/sites-enabled'
+  server:
+    webserver: apache
+    webserver_edition: vanilla

.salt/pillar/vanilla-apache/top.sls

@@ -0,0 +1 @@
+../top.sls

.salt/pillar/vanilla-nginx/example.sls

@@ -0,0 +1 @@
+../../../pillar.example

.salt/pillar/vanilla-nginx/overlay.sls

@@ -0,0 +1,7 @@
+###
+# Testing: Nginx @ Vanilla
+###
+vhosting:
+  server:
+    webserver: nginx
+    webserver_edition: vanilla

.salt/pillar/vanilla-nginx/top.sls

@@ -0,0 +1 @@
+../top.sls

.salt/pillar/zendserver-apache/example.sls

@@ -0,0 +1 @@
+../../../pillar.example

.salt/pillar/zendserver-apache/overlay.sls

@@ -0,0 +1,25 @@
+###
+# Testing: Apache @ ZendServer
+###
+vhosting:
+  lookup:
+    webstack: 'zendserver.apache'
+    php_config_dir: '/usr/local/zend/etc/conf.d'
+
+    webserver_config_dir: '/etc/apache2'
+    sites_available: '/etc/apache2/sites-available'
+    sites_enabled: '/etc/apache2/sites-enabled'
+  server:
+    webserver: apache
+    webserver_edition: zendserver
+
+# ZendServer settings
+zendserver:
+  version:
+    zend: '8.0'
+    php: '5.6'
+    apache: '2.2' # Travis still uses Ubuntu 12.04 so Apache 2.2
+
+  # Which webserver to use, can either be apache or nginx
+  webserver: apache
+  bootstrap: False

.salt/pillar/zendserver-apache/top.sls

@@ -0,0 +1 @@
+../top.sls

.salt/pillar/zendserver-nginx/example.sls

@@ -0,0 +1 @@
+../../../pillar.example

.salt/pillar/zendserver-nginx/overlay.sls

@@ -0,0 +1,25 @@
+###
+# Testing: Nginx @ ZendServer
+###
+vhosting:
+  lookup:
+    php_config_dir: '/usr/local/zend/etc/conf.d'
+  server:
+    webserver: nginx
+    webserver_edition: zendserver
+
+phpfpm:
+  lookup:
+    dirs:
+      config: /usr/local/zend/etc/fpm.d
+      socket: /usr/local/zend/tmp
+
+# ZendServer settings
+zendserver:
+  version:
+    zend: '8.0'
+    php: '5.6'
+
+  # Which webserver to use, can either be apache or nginx
+  webserver: nginx
+  bootstrap: False

.salt/pillar/zendserver-nginx/top.sls

@@ -0,0 +1 @@
+../top.sls

.travis.yml

@@ -6,9 +6,12 @@ env:
   global:
     - BS_PIP_ALLOWED=1
     - BS_ECHO_DEBUG=1
-    - SALT_ARGS="-l debug --local --retcode-passthrough --pillar-root=.salt/pillar --file-root=$PWD"
-  matrix:
     - STATE=vhosting.travis,vhosting
+  matrix:
+    - SALT_ARGS="-l debug --local --retcode-passthrough --pillar-root=.salt/pillar/vanilla-nginx --file-root=$PWD"
+    - SALT_ARGS="-l debug --local --retcode-passthrough --pillar-root=.salt/pillar/vanilla-apache --file-root=$PWD"
+    - SALT_ARGS="-l debug --local --retcode-passthrough --pillar-root=.salt/pillar/zendserver-nginx --file-root=$PWD"
+    - SALT_ARGS="-l debug --local --retcode-passthrough --pillar-root=.salt/pillar/zendserver-apache --file-root=$PWD"
 
 before_install:
   - sudo apt-get update
@@ -32,9 +35,8 @@ install:
   - sudo git clone https://github.com/enrise/nginx-formula.git $PWD/nginx-formula && ln -sfn $PWD/nginx-formula/nginx $PWD/nginx
   - sudo git clone https://github.com/enrise/phpfpm-formula.git $PWD/phpfpm-formula && ln -sfn $PWD/phpfpm-formula/phpfpm $PWD/phpfpm
   - sudo git clone https://github.com/enrise/mariadb-formula.git $PWD/mariadb-formula && ln -sfn $PWD/mariadb-formula/mariadb $PWD/mariadb
-  # We don't use these ones in the pillar.example so no need for checkouts either.
-  #- sudo git clone https://github.com/enrise/apache-formula.git $PWD/apache-formula && ln -sfn $PWD/apache-formula/apache $PWD/apache
-  #- sudo git clone https://github.com/enrise/zendserver-formula.git $PWD/zendserver-formula && ln -sfn $PWD/zendserver-formula/zendserver $PWD/zendserver
+  - sudo git clone https://github.com/enrise/apache-formula.git $PWD/apache-formula && ln -sfn $PWD/apache-formula/apache $PWD/apache
+  - sudo git clone https://github.com/enrise/zendserver-formula.git $PWD/zendserver-formula && ln -sfn $PWD/zendserver-formula/zendserver $PWD/zendserver
 
 script:
   - sudo -E salt-call state.show_sls $STATE $SALT_ARGS