add optionnal apache-formula as dependency
authorArthur Lutz <arthur.lutz@logilab.fr>
Tue, 31 Mar 2015 17:19:45 +0200
changeset 16 ca7406abadd9
parent 15 ef17a3ad1bd8
child 17 6d8fa850acf5
add optionnal apache-formula as dependency
README.rst
cubicweb/apache/init.sls
pillar.example
--- a/README.rst	Thu Jan 29 14:41:26 2015 +0100
+++ b/README.rst	Tue Mar 31 17:19:45 2015 +0200
@@ -18,6 +18,10 @@
 * salt 'host' saltutil.refresh_pillars
 * salt 'host' state.highstate
 
+Optional
+--------
+
+Use `apache-formula <https://github.com/saltstack-formulas/apache-formula>`_ to enable modules.
 
 
 Additionnal apache configuration
--- a/cubicweb/apache/init.sls	Thu Jan 29 14:41:26 2015 +0100
+++ b/cubicweb/apache/init.sls	Tue Mar 31 17:19:45 2015 +0200
@@ -1,3 +1,7 @@
+# from https://github.com/saltstack-formulas/apache-formula
+include:
+  - apache.modules
+
 apache2:
   pkg:
     - installed
--- a/pillar.example	Thu Jan 29 14:41:26 2015 +0100
+++ b/pillar.example	Tue Mar 31 17:19:45 2015 +0200
@@ -1,8 +1,9 @@
 apache: 
   enable: False # set to True if you want to deploy an apache in proxy mode
   disable_default: False # set to True to disable default apache configuration
-  enable_modules:
-    - rewrite #list of modules to enable
+  modules: #this requires the https://github.com/saltstack-formulas/apache-formula formula
+    enabled:
+       - rewrite #list of modules to enable
   vhost_conf: | 
     # insert inline configuration
     # lines here, valid for all vhosts