sum7/ansible-role-warehost
sum7
/
ansible-role-warehost
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix mailserver spamassassin and warehost-host caddy template

This commit is contained in:
Martin Geno 2016-12-29 06:00:45 +01:00
parent 28f344571e
commit 57a159a6d4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mailserver/tasks/spamassassin.yml
View File

@ -1,6 +1,6 @@
--- ---
- name: Spamassassin update - name: Spamassassin update
command: sa-update -v command: /usr/bin/vendor_perl/sa-update -v
register: bass_result register: bass_result
changed_when: "bass_result.rc != 1" changed_when: "bass_result.rc != 1"
ignore_errors: yes ignore_errors: yes

8
warehost-host/templates/caddy.conf
View File

@ -8,7 +8,9 @@
{{if not .Redirect}} {{if not .Redirect}}
gzip gzip
{{if .Proxy}} {{if .Proxy}}
proxy / {{.Proxy}} proxy / {{.Proxy}} {
header_upstream Host {host}
}
{{else}} {{else}}
root [% warehost_host_web_webroot %]/{{template "domain" .}} root [% warehost_host_web_webroot %]/{{template "domain" .}}
{{if .PHP}} {{if .PHP}}
@ -16,7 +18,7 @@
env PHP_ADMIN_VALUE "open_basedir=/tmp:/usr/share/webapps/:/etc/webapps/:/usr/share/pear:/dev/urandom:[% warehost_host_web_webroot %]/{{template "domain" .}}" env PHP_ADMIN_VALUE "open_basedir=/tmp:/usr/share/webapps/:/etc/webapps/:/usr/share/pear:/dev/urandom:[% warehost_host_web_webroot %]/{{template "domain" .}}"
} }
rewrite { rewrite {
to {path} {path}/ /index.php?_url={uri} to {path} {path}/ /index.php/{uri}
} }
{{end}} {{end}}
{{end}} {{end}}
@ -29,7 +31,7 @@
{{if .SSLRedirect}} {{if .SSLRedirect}}
http://{{template "domain".}} { http://{{template "domain".}} {
{{if not .Redirect}} {{if not .Redirect}}
redir https://{{template "domain".}}{uri} redir {{template "domain".}}{uri}
{{else}} {{else}}
{{template "content" .}} {{template "content" .}}
{{end}} {{end}}