fix: updated ansible playbook

forwardemail · Dec 6, 2023 · 756e82f · 756e82f
1 parent 3df8995
commit 756e82f
Show file tree

Hide file tree

Showing 9 changed files with 141 additions and 30 deletions.
diff --git a/ansible/playbooks/imap.yml b/ansible/playbooks/imap.yml
@@ -58,17 +58,16 @@
         rule: limit
         port: 22
         proto: tcp
-    - name: Set UFW default forward policy to ACCEPT
+    - name: Set UFW default forward policy to DROP
       lineinfile:
         dest: /etc/default/ufw
-        line: DEFAULT_FORWARD_POLICY="ACCEPT"
+        line: DEFAULT_FORWARD_POLICY="DROP"
         regexp: ^DEFAULT_FORWARD_POLICY\=
     - name: Allow ssh
       ufw:
         rule: allow
         port: 22
         proto: tcp
-    # NOTE: we port forward 993 -> 2993
     - name: Allow port 993
       ufw:
         rule: allow
@@ -85,7 +84,7 @@
     #
     - name: "Update ufw before.rules until #21 is resolved"
       template:
-        src: "{{ playbook_dir }}/templates/before.imap.rules.j2"
+        src: "{{ playbook_dir }}/templates/before.rules.j2"
         dest: /etc/ufw/before.rules
         owner: root
         mode: "0644"

diff --git a/ansible/playbooks/pop3.yml b/ansible/playbooks/pop3.yml
@@ -59,17 +59,16 @@
         rule: limit
         port: 22
         proto: tcp
-    - name: Set UFW default forward policy to ACCEPT
+    - name: Set UFW default forward policy to DROP
       lineinfile:
         dest: /etc/default/ufw
-        line: DEFAULT_FORWARD_POLICY="ACCEPT"
+        line: DEFAULT_FORWARD_POLICY="DROP"
         regexp: ^DEFAULT_FORWARD_POLICY\=
     - name: Allow ssh
       ufw:
         rule: allow
         port: 22
         proto: tcp
-    # NOTE: we port forward 995 -> 2995
     - name: Allow port 995
       ufw:
         rule: allow
@@ -86,7 +85,7 @@
     #
     - name: "Update ufw before.rules until #21 is resolved"
       template:
-        src: "{{ playbook_dir }}/templates/before.pop3.rules.j2"
+        src: "{{ playbook_dir }}/templates/before.rules.j2"
         dest: /etc/ufw/before.rules
         owner: root
         mode: "0644"

diff --git a/ansible/playbooks/smtp.yml b/ansible/playbooks/smtp.yml
@@ -115,18 +115,16 @@
         rule: limit
         port: 22
         proto: tcp
-    - name: Set UFW default forward policy to ACCEPT
+    - name: Set UFW default forward policy to DROP
       lineinfile:
         dest: /etc/default/ufw
-        line: DEFAULT_FORWARD_POLICY="ACCEPT"
+        line: DEFAULT_FORWARD_POLICY="DROP"
         regexp: ^DEFAULT_FORWARD_POLICY\=
     - name: Allow ssh
       ufw:
         rule: allow
         port: 22
         proto: tcp
-    # NOTE: we port forward 25, 587, and 2525 -> 2587 (and 2587 is itself available)
-    # NOTE: we port forward 465 -> 2465 (and 2465 is itself available)
     - name: Allow port 25
       ufw:
         rule: allow
@@ -163,7 +161,7 @@
     #
     - name: "Update ufw before.rules until #21 is resolved"
       template:
-        src: "{{ playbook_dir }}/templates/before.smtp.rules.j2"
+        src: "{{ playbook_dir }}/templates/before.rules.j2"
         dest: /etc/ufw/before.rules
         owner: root
         mode: "0644"

diff --git a/ansible/playbooks/templates/ecosystem-imap.json.j2 b/ansible/playbooks/templates/ecosystem-imap.json.j2
@@ -1,7 +1,7 @@
 {
   "apps": [
     {
-      "name": "imap",
+      "name": "imap-993",
       "script": "imap.js",
       "exec_mode": "cluster",
       "wait_ready": true,
@@ -15,9 +15,9 @@
     {
       "name": "imap-2993",
       "script": "imap.js",
-      "exec_mode": "cluster",
+      "exec_mode": "fork",
       "wait_ready": true,
-      "instances": "2",
+      "instances": "1",
       "pmx": false,
       "env_production": {
         "NODE_ENV": "production",

diff --git a/ansible/playbooks/templates/ecosystem-pop3.json.j2 b/ansible/playbooks/templates/ecosystem-pop3.json.j2
@@ -1,7 +1,7 @@
 {
   "apps": [
     {
-      "name": "pop3",
+      "name": "pop3-995",
       "script": "pop3.js",
       "exec_mode": "cluster",
       "wait_ready": true,
@@ -15,9 +15,9 @@
     {
       "name": "pop3-2995",
       "script": "pop3.js",
-      "exec_mode": "cluster",
+      "exec_mode": "fork",
       "wait_ready": true,
-      "instances": "2",
+      "instances": "1",
       "pmx": false,
       "env_production": {
         "NODE_ENV": "production",

diff --git a/ansible/playbooks/templates/ecosystem-smtp.json.j2 b/ansible/playbooks/templates/ecosystem-smtp.json.j2
@@ -1,7 +1,7 @@
 {
   "apps": [
     {
-      "name": "smtp-tls",
+      "name": "smtp-tls-587",
       "script": "smtp.js",
       "exec_mode": "cluster",
       "wait_ready": true,
@@ -13,7 +13,43 @@
       }
     },
     {
-      "name": "smtp-ssl",
+      "name": "smtp-tls-2587",
+      "script": "smtp.js",
+      "exec_mode": "fork",
+      "wait_ready": true,
+      "instances": "1",
+      "pmx": false,
+      "env_production": {
+        "NODE_ENV": "production",
+        "SMTP_PORT": 2587
+      }
+    },
+    {
+      "name": "smtp-tls-25",
+      "script": "smtp.js",
+      "exec_mode": "fork",
+      "wait_ready": true,
+      "instances": "1",
+      "pmx": false,
+      "env_production": {
+        "NODE_ENV": "production",
+        "SMTP_PORT": 25
+      }
+    },
+    {
+      "name": "smtp-tls-2525",
+      "script": "smtp.js",
+      "exec_mode": "fork",
+      "wait_ready": true,
+      "instances": "1",
+      "pmx": false,
+      "env_production": {
+        "NODE_ENV": "production",
+        "SMTP_PORT": 2525
+      }
+    },
+    {
+      "name": "smtp-ssl-465",
       "script": "smtp.js",
       "exec_mode": "cluster",
       "wait_ready": true,
@@ -24,11 +60,18 @@
         "SMTP_PORT": 465
       }
     },
-    run these in fork mode:
-    25
-    2525
-    2587
-    2465
+    {
+      "name": "smtp-ssl-2465",
+      "script": "smtp.js",
+      "exec_mode": "fork",
+      "wait_ready": true,
+      "instances": "1",
+      "pmx": false,
+      "env_production": {
+        "NODE_ENV": "production",
+        "SMTP_PORT": 465
+      }
+    },
     {
       "name": "smtp-bree",
       "script": "smtp-bree.js",

diff --git a/ecosystem-imap.json b/ecosystem-imap.json
@@ -1,12 +1,24 @@
 {
   "apps": [
     {
-      "name": "imap",
+      "name": "imap-993",
       "script": "imap.js",
       "exec_mode": "cluster",
       "wait_ready": true,
       "instances": "max",
       "pmx": false,
+      "env_production": {
+        "NODE_ENV": "production",
+        "IMAP_PORT": 993
+      }
+    },
+    {
+      "name": "imap-2993",
+      "script": "imap.js",
+      "exec_mode": "fork",
+      "wait_ready": true,
+      "instances": "1",
+      "pmx": false,
       "env_production": {
         "NODE_ENV": "production",
         "IMAP_PORT": 2993

diff --git a/ecosystem-pop3.json b/ecosystem-pop3.json
@@ -1,7 +1,7 @@
 {
   "apps": [
     {
-      "name": "pop3",
+      "name": "pop3-995",
       "script": "pop3.js",
       "exec_mode": "cluster",
       "wait_ready": true,
@@ -11,6 +11,18 @@
         "NODE_ENV": "production",
         "POP3_PORT": 995
       }
+    },
+    {
+      "name": "pop3-2995",
+      "script": "pop3.js",
+      "exec_mode": "fork",
+      "wait_ready": true,
+      "instances": "1",
+      "pmx": false,
+      "env_production": {
+        "NODE_ENV": "production",
+        "POP3_PORT": 2995
+      }
     }
   ],
   "deploy": {

diff --git a/ecosystem-smtp.json b/ecosystem-smtp.json
@@ -1,7 +1,7 @@
 {
   "apps": [
     {
-      "name": "smtp-tls",
+      "name": "smtp-tls-587",
       "script": "smtp.js",
       "exec_mode": "cluster",
       "wait_ready": true,
@@ -13,7 +13,43 @@
       }
     },
     {
-      "name": "smtp-ssl",
+      "name": "smtp-tls-2587",
+      "script": "smtp.js",
+      "exec_mode": "fork",
+      "wait_ready": true,
+      "instances": "1",
+      "pmx": false,
+      "env_production": {
+        "NODE_ENV": "production",
+        "SMTP_PORT": 2587
+      }
+    },
+    {
+      "name": "smtp-tls-25",
+      "script": "smtp.js",
+      "exec_mode": "fork",
+      "wait_ready": true,
+      "instances": "1",
+      "pmx": false,
+      "env_production": {
+        "NODE_ENV": "production",
+        "SMTP_PORT": 25
+      }
+    },
+    {
+      "name": "smtp-tls-2525",
+      "script": "smtp.js",
+      "exec_mode": "fork",
+      "wait_ready": true,
+      "instances": "1",
+      "pmx": false,
+      "env_production": {
+        "NODE_ENV": "production",
+        "SMTP_PORT": 2525
+      }
+    },
+    {
+      "name": "smtp-ssl-465",
       "script": "smtp.js",
       "exec_mode": "cluster",
       "wait_ready": true,
@@ -24,6 +60,18 @@
         "SMTP_PORT": 465
       }
     },
+    {
+      "name": "smtp-ssl-2465",
+      "script": "smtp.js",
+      "exec_mode": "fork",
+      "wait_ready": true,
+      "instances": "1",
+      "pmx": false,
+      "env_production": {
+        "NODE_ENV": "production",
+        "SMTP_PORT": 465
+      }
+    },
     {
       "name": "smtp-bree",
       "script": "smtp-bree.js",