From 00c2137695d582d4d38a76ed0b643aa82c3263d8 Mon Sep 17 00:00:00 2001
From: Sonny Bakker <sonny871@hotmail.com>
Date: Wed, 25 Nov 2020 15:47:56 +0100
Subject: [PATCH] Add skip_common_setup flag

Optionally skips default common setup
---
 tasks/main.yml  | 53 ++-----------------------------------------------
 tasks/setup.yml | 51 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 51 deletions(-)
 create mode 100644 tasks/setup.yml

diff --git a/tasks/main.yml b/tasks/main.yml
index 2811ac4..9079cfa 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,51 +1,2 @@
-- include_tasks: "sudoers.yml"
-  loop:
-    - { src: "sudoers.j2", dest: "/etc/sudoers.d/20-ansible-extra" }
-
-- name: copy ssh template
-  template:
-    src: "sshd_config.j2"
-    dest: "/etc/ssh/sshd_config"
-    owner: root
-    group: root
-    mode: "0644"
-  notify: reload ssh
-
-- name: viva la hollande
-  locale_gen:
-    name: nl_NL.UTF-8
-    state: present
-
-- name: ensure basic tooling is installed
-  apt:
-    name:
-      - acl
-      - man
-      - apt-transport-https
-      - ca-certificates
-      - software-properties-common
-      - policykit-1
-      - libpolkit-agent-1-0
-      - nftables
-      - openssh-client
-      - bash-completion
-      - git
-      - vim
-      - curl
-      - tree
-      - haveged
-      - rsync
-    state: present
-
-- name: copy firewall template
-  template:
-    src: "nftables.j2"
-    dest: "/etc/nftables.conf"
-    owner: root
-    group: root
-    mode: "0600"
-  notify: restart nftables
-
-# see https://wiki.debian.org/systemd#Orphaned_processes
-- name: enable loginctl user-linger
-  command: "loginctl enable-linger {{ default_user|quote }}" # noqa 301
+- include_tasks: "setup.yml"
+  when: skip_common_setup is not defined or not skip_common_setup
diff --git a/tasks/setup.yml b/tasks/setup.yml
new file mode 100644
index 0000000..2811ac4
--- /dev/null
+++ b/tasks/setup.yml
@@ -0,0 +1,51 @@
+- include_tasks: "sudoers.yml"
+  loop:
+    - { src: "sudoers.j2", dest: "/etc/sudoers.d/20-ansible-extra" }
+
+- name: copy ssh template
+  template:
+    src: "sshd_config.j2"
+    dest: "/etc/ssh/sshd_config"
+    owner: root
+    group: root
+    mode: "0644"
+  notify: reload ssh
+
+- name: viva la hollande
+  locale_gen:
+    name: nl_NL.UTF-8
+    state: present
+
+- name: ensure basic tooling is installed
+  apt:
+    name:
+      - acl
+      - man
+      - apt-transport-https
+      - ca-certificates
+      - software-properties-common
+      - policykit-1
+      - libpolkit-agent-1-0
+      - nftables
+      - openssh-client
+      - bash-completion
+      - git
+      - vim
+      - curl
+      - tree
+      - haveged
+      - rsync
+    state: present
+
+- name: copy firewall template
+  template:
+    src: "nftables.j2"
+    dest: "/etc/nftables.conf"
+    owner: root
+    group: root
+    mode: "0600"
+  notify: restart nftables
+
+# see https://wiki.debian.org/systemd#Orphaned_processes
+- name: enable loginctl user-linger
+  command: "loginctl enable-linger {{ default_user|quote }}" # noqa 301