aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tasks/email.yml5
-rw-r--r--tasks/general.yml8
-rw-r--r--tasks/network.yml5
-rw-r--r--templates/etc_pf.conf.j21
4 files changed, 7 insertions, 12 deletions
diff --git a/tasks/email.yml b/tasks/email.yml
index f36d6db..3585c3f 100644
--- a/tasks/email.yml
+++ b/tasks/email.yml
@@ -1,8 +1,3 @@
-- name: Install dma
- package:
- name: dma
- state: present
-
- name: Create dma config directory
file:
path: /etc/dma
diff --git a/tasks/general.yml b/tasks/general.yml
index f527f87..2131059 100644
--- a/tasks/general.yml
+++ b/tasks/general.yml
@@ -1,7 +1,11 @@
-- name: Install rsync
+- name: Install packages
package:
- name: rsync
+ name: "{{ item }}"
state: present
+ loop:
+ - rsync
+ - nginx
+ - dma
- name: Set up periodic.conf
template:
diff --git a/tasks/network.yml b/tasks/network.yml
index 81983f5..d68344d 100644
--- a/tasks/network.yml
+++ b/tasks/network.yml
@@ -63,11 +63,6 @@
shell: pfctl -f /etc/pf.conf
when: pf_conf.changed
-- name: Install nginx
- package:
- name: nginx
- state: present
-
- name: Configure nginx.conf
template:
src: usr_local_etc_nginx_nginx.conf.j2
diff --git a/templates/etc_pf.conf.j2 b/templates/etc_pf.conf.j2
index 3802fae..0b5a756 100644
--- a/templates/etc_pf.conf.j2
+++ b/templates/etc_pf.conf.j2
@@ -4,6 +4,7 @@ wan_if = "wan0"
# Default policy
set skip on lo
set block-policy return
+scrub in
block in all
# Allow all outbound traffic