saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #299 from noelmcloughlin/fixit

Browse Source 
fix(memory): pass variable not dict
This commit is contained in:
sticky-note 2021-01-05 09:49:28 +11:00 committed by GitHub
commit c792cc24d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apache/config/modules/mod_cgi.sls
View File

@ -19,7 +19,7 @@ apache-config-modules-cgi-cmd-run:
- template: {{ apache.get('template_engine', 'jinja') }} - template: {{ apache.get('template_engine', 'jinja') }}
- makedirs: True - makedirs: True
- context: - context:
apache: {{ apache|json }} svcname: {{ apache.service.name }}
- require: - require:
- pkg: apache-package-install-pkg-installed - pkg: apache-package-install-pkg-installed
- watch_in: - watch_in:

2
apache/config/modules/mod_perl2.sls
View File

@ -47,7 +47,7 @@ apache-config-modules-perl-pkg:
- makedirs: True - makedirs: True
- template: {{ apache.get('template_engine', 'jinja') }} - template: {{ apache.get('template_engine', 'jinja') }}
- context: - context:
apache: {{ apache|json }} svcname: {{ apache.service.name }}
- require: - require:
- pkg: apache-package-install-pkg-installed - pkg: apache-package-install-pkg-installed
- watch_in: - watch_in:

4
apache/config/modules/mod_php5.sls
View File

@ -42,7 +42,7 @@ apache-config-modules-php5-pkg:
- makedirs: True - makedirs: True
- template: {{ apache.get('template_engine', 'jinja') }} - template: {{ apache.get('template_engine', 'jinja') }}
- context: - context:
apache: {{ apache|json }} svcname: {{ apache.service.name }}
- watch_in: - watch_in:
- module: apache-service-running-restart - module: apache-service-running-restart
- require_in: - require_in:
@ -63,7 +63,7 @@ apache-config-modules-php5-pkg:
- makedirs: True - makedirs: True
- template: {{ apache.get('template_engine', 'jinja') }} - template: {{ apache.get('template_engine', 'jinja') }}
- context: - context:
apache: {{ apache|json }} svcname: {{ apache.service.name }}
- require: - require:
- pkg: apache-package-install-pkg-installed - pkg: apache-package-install-pkg-installed
- watch_in: - watch_in:

2
apache/config/modules/mod_proxy.sls
View File

@ -36,7 +36,7 @@ apache-config-modules-proxy-file-managed:
- makedirs: True - makedirs: True
- template: {{ apache.get('template_engine', 'jinja') }} - template: {{ apache.get('template_engine', 'jinja') }}
- context: - context:
apache: {{ apache|json }} svcname: {{ apache.service.name }}
- require: - require:
- pkg: apache-package-install-pkg-installed - pkg: apache-package-install-pkg-installed
- watch_in: - watch_in:

2
apache/config/modules/mod_proxy_http.sls
View File

@ -38,7 +38,7 @@ apache-config-modules-proxy_http-file-managed:
- makedirs: True - makedirs: True
- template: {{ apache.get('template_engine', 'jinja') }} - template: {{ apache.get('template_engine', 'jinja') }}
- context: - context:
apache: {{ apache|json }} svcname: {{ apache.service.name }}
- require: - require:
- pkg: apache-package-install-pkg-installed - pkg: apache-package-install-pkg-installed
- watch_in: - watch_in:

2
apache/config/modules/mod_rewrite.sls
View File

@ -36,7 +36,7 @@ apache-config-modules-rewrite-file-managed-conf:
- makedirs: True - makedirs: True
- template: {{ apache.get('template_engine', 'jinja') }} - template: {{ apache.get('template_engine', 'jinja') }}
- context: - context:
apache: {{ apache|json }} svcname: {{ apache.service.name }}
- require: - require:
- pkg: apache-package-install-pkg-installed - pkg: apache-package-install-pkg-installed
- watch_in: - watch_in:

2
apache/config/modules/mod_suexec.sls
View File

@ -20,7 +20,7 @@ apache-config-modules-suexec-file-managed:
- makedirs: True - makedirs: True
- template: {{ apache.get('template_engine', 'jinja') }} - template: {{ apache.get('template_engine', 'jinja') }}
- context: - context:
apache: {{ apache|json }} svcname: {{ apache.service.name }}
- require: - require:
- pkg: apache-package-install-pkg-installed - pkg: apache-package-install-pkg-installed
- watch_in: - watch_in:

4
apache/files/FreeBSD/mod_cgi.conf.jinja
View File

@ -1,6 +1,6 @@
<IfModule !mpm_prefork_module> <IfModule !mpm_prefork_module>
LoadModule cgid_module libexec/{{ apache.service.name }}/mod_cgid.so LoadModule cgid_module libexec/{{ svcname }}/mod_cgid.so
</IfModule> </IfModule>
<IfModule mpm_prefork_module> <IfModule mpm_prefork_module>
LoadModule cgi_module libexec/{{ apache.service.name }}/mod_cgi.so LoadModule cgi_module libexec/{{ svcname }}/mod_cgi.so
</IfModule> </IfModule>

2
apache/files/FreeBSD/mod_perl.conf.jinja
View File

@ -1 +1 @@
LoadModule perl_module libexec/{{ apache.service.name }}/mod_perl.so LoadModule perl_module libexec/{{ svcname }}/mod_perl.so

2
apache/files/FreeBSD/mod_php5.conf.jinja
View File

@ -1,4 +1,4 @@
LoadModule php5_module /usr/local/libexec/{{ apache.service.name }}/libphp5.so LoadModule php5_module /usr/local/libexec/{{ svcname }}/libphp5.so
DirectoryIndex index.html index.php DirectoryIndex index.html index.php

2
apache/files/FreeBSD/mod_proxy.conf.jinja
View File

@ -1 +1 @@
LoadModule proxy_module libexec/{{ apache.service.name }}/mod_proxy.so LoadModule proxy_module libexec/{{ svcname }}/mod_proxy.so

2
apache/files/FreeBSD/mod_proxy_http.conf.jinja
View File

@ -1 +1 @@
LoadModule proxy_http_module libexec/{{ apache.service.name }}/mod_proxy_http.so LoadModule proxy_http_module libexec/{{ svcname }}/mod_proxy_http.so

2
apache/files/FreeBSD/mod_rewrite.conf.jinja
View File

@ -1 +1 @@
LoadModule rewrite_module libexec/{{ apache.service.name }}/mod_rewrite.so LoadModule rewrite_module libexec/{{ svcname }}/mod_rewrite.so

2
apache/files/FreeBSD/mod_suexec.conf.jinja
View File

@ -1 +1 @@
LoadModule suexec_module libexec/{{ apache.service.name }}/mod_suexec.so LoadModule suexec_module libexec/{{ svcname }}/mod_suexec.so