debian campatibly

mailserver/tasks/install_debian.yml

@@ -0,0 +1,23 @@
+---
+- name: Install dependencies
+  apt: name={{item}} state=present
+  with_items:
+  - postfix
+  - dovecot-imapd
+  - dovecot-pop3d
+  - dovecot-pgsql
+  - dovecot-managesieved
+  - dovecot-sieve
+  - spamassassin
+  - procmail
+  notify:
+    - restart postfix
+    - restart dovecot
+
+
+
+- name: Create aliases
+  file: path=/etc/postfix/{{item}} state=touch
+  with_items:
+    - aliases
+    - transport

mailserver/tasks/main.yml

@@ -1,6 +1,9 @@
 ---
 - include: install_archlinux.yml
-  when: ansible_os_family == 'Archlinux'
+  when: (ansible_distribution == "Antergos") or (ansible_os_family == "Archlinux")
+
+- include: install_debian.yml
+  when: (ansible_distribution == "Debian") or (ansible_distribution == "Ubuntu")
 
 - name: Add service smtp lines
   lineinfile: dest=/etc/services regexp='^smtps {{item}}' line="smtps {{item}}"

mailserver/tasks/spamassassin.yml

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

warehost-api/templates/warehost-api.unit

@@ -13,7 +13,6 @@ After=postgresql.service
 #LimitNOFILE=65535
 Type=simple
 User=warehost
-Group=nobody
 ExecStart=/usr/local/bin/warehost-api -c /etc/warehost/api.conf
 Restart=always
 

warehost-ftp/templates/warehost-ftp.unit

@@ -7,7 +7,6 @@ After=postgresql.service
 [Service]
 Type=simple
 User=warehost
-Group=nobody
 ExecStart=/usr/local/bin/warehost-ftp -c /etc/warehost/ftp.conf
 Restart=always
 

warehost-host/templates/warehost-host.service

@@ -7,7 +7,6 @@ After=postgresql.service
 [Service]
 Type=oneshot
 User=warehost
-Group=nobody
 ExecStart=/usr/local/bin/warehost-host -c /etc/warehost/host.conf
 PermissionsStartOnly=true
 ExecStartPost=/usr/bin/systemctl reload {{warehost_host_web_type}}

warehost-web/templates/warehost-web.unit

@@ -13,7 +13,6 @@ After=postgresql.service
 #LimitNOFILE=65535
 Type=simple
 User=warehost
-Group=nobody
 ExecStart=/usr/local/bin/warehost-web -c /etc/warehost/web.conf
 Restart=always