diff --git a/mailserver/tasks/dovecot.yml b/mailserver/tasks/dovecot.yml index dff76db..c932e02 100644 --- a/mailserver/tasks/dovecot.yml +++ b/mailserver/tasks/dovecot.yml @@ -29,4 +29,4 @@ command: sievec /var/lib/dovecot/sieve/default.sieve creates=/var/lib/dovecot/sieve/default.svbin - name: Enable dovecot - service: name=dovecot state=started enabled=yes + service: name=dovecot enabled=yes diff --git a/warehost-host/defaults/main.yml b/warehost-host/defaults/main.yml index 337d42a..81e61cb 100644 --- a/warehost-host/defaults/main.yml +++ b/warehost-host/defaults/main.yml @@ -8,4 +8,6 @@ warehost_host_db_host: "" warehost_host_db_user: root warehost_host_db_pass: "{{ lookup('password', 'credentials/mysql_root length=15') }}" warehost_host_db_prefix: warehost_db +warehost_web_webroot: /srv/http/web +http_usr: http http_grp: http diff --git a/warehost-host/templates/config.yml b/warehost-host/templates/config.yml index 6a1ad2b..f6058c2 100644 --- a/warehost-host/templates/config.yml +++ b/warehost-host/templates/config.yml @@ -3,9 +3,18 @@ warehostdatabase: "host={{warehost_db_host}} user={{warehost_db_user}} dbname={{ log: path: /var/log/warehost/host.log databasedebug: false +path_user: {{http_usr}} +path_group: {{http_grp}} +ftp: + enable: true + path_id: /srv/ftp/%d/ +web_modul: + enable: true + path_id: {{warehost_web_webroot}}/%d/ web: enable: true template: /etc/warehost/host-web.tmpl + path_domain: /srv/http/domain config: {{warehost_host_web_path}} database: enable: true