Skip to content

Commit

Permalink
fix(memory): pass variable not dict
Browse files Browse the repository at this point in the history
  • Loading branch information
@noelmcloughlin
noelmcloughlin committed Dec 8, 2020
1 parent 0e93df3 commit 2830081
Show file tree
Hide file tree
Showing 14 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion apache/config/modules/mod_cgi.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ apache-config-modules-cgi-cmd-run:
- template: {{ apache.get('template_engine', 'jinja') }}
- makedirs: True
- context:
apache: {{ apache|json }}
svcname: {{ apache.service.name }}
- require:
- pkg: apache-package-install-pkg-installed
- watch_in:
Expand Down
2 changes: 1 addition & 1 deletion apache/config/modules/mod_perl2.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ apache-config-modules-perl-pkg:
- makedirs: True
- template: {{ apache.get('template_engine', 'jinja') }}
- context:
apache: {{ apache|json }}
svcname: {{ apache.service.name }}
- require:
- pkg: apache-package-install-pkg-installed
- watch_in:
Expand Down
4 changes: 2 additions & 2 deletions apache/config/modules/mod_php5.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ apache-config-modules-php5-pkg:
- makedirs: True
- template: {{ apache.get('template_engine', 'jinja') }}
- context:
apache: {{ apache|json }}
svcname: {{ apache.service.name }}
- watch_in:
- module: apache-service-running-restart
- require_in:
Expand All @@ -63,7 +63,7 @@ apache-config-modules-php5-pkg:
- makedirs: True
- template: {{ apache.get('template_engine', 'jinja') }}
- context:
apache: {{ apache|json }}
svcname: {{ apache.service.name }}
- require:
- pkg: apache-package-install-pkg-installed
- watch_in:
Expand Down
2 changes: 1 addition & 1 deletion apache/config/modules/mod_proxy.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ apache-config-modules-proxy-file-managed:
- makedirs: True
- template: {{ apache.get('template_engine', 'jinja') }}
- context:
apache: {{ apache|json }}
svcname: {{ apache.service.name }}
- require:
- pkg: apache-package-install-pkg-installed
- watch_in:
Expand Down
2 changes: 1 addition & 1 deletion apache/config/modules/mod_proxy_http.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ apache-config-modules-proxy_http-file-managed:
- makedirs: True
- template: {{ apache.get('template_engine', 'jinja') }}
- context:
apache: {{ apache|json }}
svcname: {{ apache.service.name }}
- require:
- pkg: apache-package-install-pkg-installed
- watch_in:
Expand Down
2 changes: 1 addition & 1 deletion apache/config/modules/mod_rewrite.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ apache-config-modules-rewrite-file-managed-conf:
- makedirs: True
- template: {{ apache.get('template_engine', 'jinja') }}
- context:
apache: {{ apache|json }}
svcname: {{ apache.service.name }}
- require:
- pkg: apache-package-install-pkg-installed
- watch_in:
Expand Down
2 changes: 1 addition & 1 deletion apache/config/modules/mod_suexec.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ apache-config-modules-suexec-file-managed:
- makedirs: True
- template: {{ apache.get('template_engine', 'jinja') }}
- context:
apache: {{ apache|json }}
svcname: {{ apache.service.name }}
- require:
- pkg: apache-package-install-pkg-installed
- watch_in:
Expand Down
4 changes: 2 additions & 2 deletions apache/files/FreeBSD/mod_cgi.conf.jinja
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<IfModule !mpm_prefork_module>
LoadModule cgid_module libexec/{{ apache.service.name }}/mod_cgid.so
LoadModule cgid_module libexec/{{ svcname }}/mod_cgid.so
</IfModule>
<IfModule mpm_prefork_module>
LoadModule cgi_module libexec/{{ apache.service.name }}/mod_cgi.so
LoadModule cgi_module libexec/{{ svcname }}/mod_cgi.so
</IfModule>
2 changes: 1 addition & 1 deletion apache/files/FreeBSD/mod_perl.conf.jinja
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
LoadModule perl_module libexec/{{ apache.service.name }}/mod_perl.so
LoadModule perl_module libexec/{{ svcname }}/mod_perl.so
2 changes: 1 addition & 1 deletion apache/files/FreeBSD/mod_php5.conf.jinja
View file
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion apache/files/FreeBSD/mod_proxy.conf.jinja
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
LoadModule proxy_module libexec/{{ apache.service.name }}/mod_proxy.so
LoadModule proxy_module libexec/{{ svcname }}/mod_proxy.so
2 changes: 1 addition & 1 deletion apache/files/FreeBSD/mod_proxy_http.conf.jinja
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 1 deletion apache/files/FreeBSD/mod_rewrite.conf.jinja
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
LoadModule rewrite_module libexec/{{ apache.service.name }}/mod_rewrite.so
LoadModule rewrite_module libexec/{{ svcname }}/mod_rewrite.so
2 changes: 1 addition & 1 deletion apache/files/FreeBSD/mod_suexec.conf.jinja
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
LoadModule suexec_module libexec/{{ apache.service.name }}/mod_suexec.so
LoadModule suexec_module libexec/{{ svcname }}/mod_suexec.so

0 comments on commit 2830081

Please sign in to comment.