second batch

saltstack-formulas · Sep 14, 2021 · 1002efa · 1002efa
1 parent 302db15
commit 1002efa
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/apache/config/modules/mod_fastcgi.sls b/apache/config/modules/mod_fastcgi.sls
@@ -38,7 +38,7 @@ apache-config-modules-fastcgi_cmd-run:
     - unless: ls {{ apache.moddir }}/fastcgi.load
     - order: 225
     - require:
-      - pkg: mod-fastcgi
+      - pkg: apache-config-modules-fastcgi-pkg
     - watch_in:
       - module: apache-service-running-restart
     - require_in:

diff --git a/apache/config/modules/mod_php5.sls b/apache/config/modules/mod_php5.sls
@@ -25,7 +25,7 @@ apache-config-modules-php5-pkg:
     - unless: ls {{ apache.moddir }}/php5.load || egrep "^APACHE_MODULES=" /etc/sysconfig/apache2 | grep ' php5'
     - order: 225
     - require:
-      - pkg: mod-php5
+      - pkg: apache-config-modules-php5-pkg
     - watch_in:
       - module: apache-service-running-restart
     - require_in:

diff --git a/apache/config/modules/mod_wsgi.sls b/apache/config/modules/mod_wsgi.sls
@@ -14,7 +14,7 @@ apache-config-modules-wsgi-pkg:
   pkg.installed:
     - name: {{ apache.pkg.mod_wsgi }}
     - require:
-      - pkg: apache
+      - pkg: apache-package-install-pkg-installed
     - watch_in:
       - module: apache-service-running-restart
     - require_in:

diff --git a/apache/osfamilymap.yaml b/apache/osfamilymap.yaml
@@ -26,7 +26,7 @@ Debian:
   portsfile: /etc/apache2/ports.conf
 
   mod_wsgi: libapache2-mod-wsgi
-  mod_php5: libapache2-mod-php5
+  mod_php5: libapache2-mod-php
   mod_perl2: libapache2-mod-perl2
   mod_fcgid: libapache2-mod-fcgid
   mod_upload_progress: libapache2-mod-upload-progress

diff --git a/kitchen.yml b/kitchen.yml
@@ -506,11 +506,11 @@ suites:
             - apache.config.modules.mod_actions
             - apache.config.modules.mod_cgi
             - apache.config.modules.mod_dav_svn
-            - apache.config.modules.mod_fastcgi
+            # - apache.config.modules.mod_fastcgi
             - apache.config.modules.mod_fcgid
             - apache.config.modules.mod_geoip
             - apache.config.modules.mod_headers
-            - apache.config.modules.mod_logio
+            # - apache.config.modules.mod_logio
             - apache.config.modules.mod_mpm
             - apache.config.modules.mod_pagespeed
             - apache.config.modules.mod_perl2

diff --git a/pillar.example b/pillar.example
@@ -175,9 +175,9 @@ apache:
     example2.com_ssl:
       port: 443
       ServerName: example.com
-      SSLCertificateFile: /path/to/ssl.crt
-      SSLCertificateKeyFile: /path/to/ssl.key
-      SSLCertificateChainFile: /path/to/ssl.ca.crt
+      # SSLCertificateFile: /path/to/ssl.crt
+      # SSLCertificateKeyFile: /path/to/ssl.key
+      # SSLCertificateChainFile: /path/to/ssl.ca.crt
 
     # Use RedirectMatch Directive
     redirectmatch.com:
@@ -391,21 +391,21 @@ apache:
   modules:
     enabled:   # List modules to enable
       - ssl
-      - prefork
+      # - prefork
       - rewrite
       - proxy
       - proxy_ajp
       - proxy_html
       - headers
       # geoip
       - status
-      - logio
+      # - logio
       - dav
       - dav_fs
       - dav_lock
       - auth_digest
       - socache_shmcb
-      - watchdog
+      # - watchdog
       - xml2enc
       - ldap
     disabled:  # List modules to disable