summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElizabeth Hunt <elizabeth.hunt@simponic.xyz>2024-03-31 20:18:32 -0400
committerElizabeth Hunt <elizabeth.hunt@simponic.xyz>2024-03-31 20:18:32 -0400
commitb2fae5840772f26e9b2f26d318ad6aaf5e4b550f (patch)
tree7c1813882ac5d372c6d2d4b99edcdc847e91b441
parentb566e9385082678bc2f75e0712d856fa1c64c94c (diff)
downloadoldinfra-b2fae5840772f26e9b2f26d318ad6aaf5e4b550f.tar.gz
oldinfra-b2fae5840772f26e9b2f26d318ad6aaf5e4b550f.zip
sieve + acl updates
-rw-r--r--group_vars/vpn.yml2
-rw-r--r--roles/mail/templates/docker-compose.yml.j22
-rw-r--r--roles/roundcube/templates/docker-compose.yml.j21
-rw-r--r--roles/roundcube/templates/sieve.inc.php.j24
-rw-r--r--roles/vpn/files/config/acl.json2
5 files changed, 9 insertions, 2 deletions
diff --git a/group_vars/vpn.yml b/group_vars/vpn.yml
index eb11201..0a62dd1 100644
--- a/group_vars/vpn.yml
+++ b/group_vars/vpn.yml
@@ -1,5 +1,5 @@
---
headscale_oidc_secret: "{{ lookup('env', 'HEADSCALE_OIDC_SECRET') }}"
headscale_allowed_users:
- - "elizabeth.hunt@simponic.xyz"
+ - "elizabeth@simponic.xyz"
- "riley@simponic.xyz"
diff --git a/roles/mail/templates/docker-compose.yml.j2 b/roles/mail/templates/docker-compose.yml.j2
index a624a56..7a7c664 100644
--- a/roles/mail/templates/docker-compose.yml.j2
+++ b/roles/mail/templates/docker-compose.yml.j2
@@ -9,6 +9,7 @@ services:
- "465:465"
- "587:587"
- "993:993"
+ - "0.0.0.0:4190:4190"
volumes:
- ./docker-data/dms/mail-data/:/var/mail/
- ./docker-data/dms/mail-state/:/var/mail-state/
@@ -20,6 +21,7 @@ services:
- SSL_TYPE=letsencrypt
- ENABLE_CLAMAV=0
- ENABLE_AMAVIS=0
+ - ENABLE_MANAGESIEVE=1
- ENABLE_FAIL2BAN=1
- SPOOF_PROTECTION=1
- ACCOUNT_PROVISIONER=LDAP
diff --git a/roles/roundcube/templates/docker-compose.yml.j2 b/roles/roundcube/templates/docker-compose.yml.j2
index e29d400..1860459 100644
--- a/roles/roundcube/templates/docker-compose.yml.j2
+++ b/roles/roundcube/templates/docker-compose.yml.j2
@@ -19,4 +19,5 @@ services:
- ROUNDCUBEMAIL_DEFAULT_HOST=ssl://mail.simponic.xyz
- ROUNDCUBEMAIL_DEFAULT_PORT=993
- ROUNDCUBEMAIL_SMTP_SERVER=tls://mail.simponic.xyz
+ - ROUNDCUBEMAIL_PLUGINS=archive,zipdownload,managesieve,markasjunk
- ROUNDCUBEMAIL_SMTP_PORT=587
diff --git a/roles/roundcube/templates/sieve.inc.php.j2 b/roles/roundcube/templates/sieve.inc.php.j2
new file mode 100644
index 0000000..8970ff3
--- /dev/null
+++ b/roles/roundcube/templates/sieve.inc.php.j2
@@ -0,0 +1,4 @@
+<?php
+
+$config['managesieve_host'] = "tls://mail.simponic.xyz";
+$config['managesieve_auth_type'] = "PLAIN";
diff --git a/roles/vpn/files/config/acl.json b/roles/vpn/files/config/acl.json
index 0edf909..b8cf1a5 100644
--- a/roles/vpn/files/config/acl.json
+++ b/roles/vpn/files/config/acl.json
@@ -1,6 +1,6 @@
{
"groups": {
- "group:admin": ["elizabeth.hunt"],
+ "group:admin": ["elizabeth"],
"group:roomates": ["riley"],
"group:friends": ["riley"],
"group:sys": ["sys"]