From e51d53adbf54c24aa4ec45e9c1301b9f8bbeeb14 Mon Sep 17 00:00:00 2001
From: Mateo <mdm@athelas.fr>
Date: Thu, 25 Jul 2024 16:59:44 +0200
Subject: [PATCH 1/4] Edit usertwist port

---
 tasks/install_caddy.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tasks/install_caddy.yml b/tasks/install_caddy.yml
index 895013e..2ebb729 100644
--- a/tasks/install_caddy.yml
+++ b/tasks/install_caddy.yml
@@ -56,6 +56,11 @@
       enabled: true
       state: started
 
+  - name: Edit usertwist default port
+    ansible.builtin.lineinfile:
+      path: /etc/environment
+      line: "PORT={{ usertwist_port | default('8080')}}"
+
   - name: Restart Caddy service
     ansible.builtin.service:
       name: caddy

From 98f646a3e689ad8d04a2585d408c5dad21dac038 Mon Sep 17 00:00:00 2001
From: Mateo <mdm@athelas.fr>
Date: Tue, 30 Jul 2024 13:37:30 +0200
Subject: [PATCH 2/4] Roles test

---
 roles/setup_iptables/README.md      | 38 +++++++++++++++++++++++++++++
 roles/setup_iptables/meta/main.yml  | 34 ++++++++++++++++++++++++++
 roles/setup_iptables/tasks/main.yml | 17 +++++++++++++
 tasks/setup_iptables.yml            | 19 ++-------------
 4 files changed, 91 insertions(+), 17 deletions(-)
 create mode 100644 roles/setup_iptables/README.md
 create mode 100644 roles/setup_iptables/meta/main.yml
 create mode 100644 roles/setup_iptables/tasks/main.yml

diff --git a/roles/setup_iptables/README.md b/roles/setup_iptables/README.md
new file mode 100644
index 0000000..225dd44
--- /dev/null
+++ b/roles/setup_iptables/README.md
@@ -0,0 +1,38 @@
+Role Name
+=========
+
+A brief description of the role goes here.
+
+Requirements
+------------
+
+Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+
+Role Variables
+--------------
+
+A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+
+Dependencies
+------------
+
+A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/roles/setup_iptables/meta/main.yml b/roles/setup_iptables/meta/main.yml
new file mode 100644
index 0000000..ea68190
--- /dev/null
+++ b/roles/setup_iptables/meta/main.yml
@@ -0,0 +1,34 @@
+galaxy_info:
+  author: your name
+  description: your role description
+  company: your company (optional)
+
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: http://example.com/issue/tracker
+
+  # Choose a valid license ID from https://spdx.org - some suggested licenses:
+  # - BSD-3-Clause (default)
+  # - MIT
+  # - GPL-2.0-or-later
+  # - GPL-3.0-only
+  # - Apache-2.0
+  # - CC-BY-4.0
+  license: license (GPL-2.0-or-later, MIT, etc)
+
+  min_ansible_version: 2.1
+
+  # If this a Container Enabled role, provide the minimum Ansible Container version.
+  # min_ansible_container_version:
+
+  galaxy_tags: []
+    # List tags for your role here, one per line. A tag is a keyword that describes
+    # and categorizes the role. Users find roles by searching for tags. Be sure to
+    # remove the '[]' above, if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
+    #       Maximum 20 tags per role.
+
+dependencies: []
+  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
+  # if you add dependencies to this list.
diff --git a/roles/setup_iptables/tasks/main.yml b/roles/setup_iptables/tasks/main.yml
new file mode 100644
index 0000000..c468a39
--- /dev/null
+++ b/roles/setup_iptables/tasks/main.yml
@@ -0,0 +1,17 @@
+---
+# tasks file for setup_iptables
+- name: Open needed ports
+  ansible.builtin.iptables:
+    chain: INPUT
+    protocol: tcp
+    in_interface: eth0
+    jump: ACCEPT
+    destination_ports:
+      - "22"
+      - "443"
+      - "80"
+
+- name: Set INPUT policy to DROP
+  ansible.builtin.iptables:
+    chain: INPUT
+    policy: DROP
\ No newline at end of file
diff --git a/tasks/setup_iptables.yml b/tasks/setup_iptables.yml
index b6a297e..07478e1 100644
--- a/tasks/setup_iptables.yml
+++ b/tasks/setup_iptables.yml
@@ -1,20 +1,5 @@
 - name: Edit iptables settings
   hosts: athelas
   become: true
-  tasks:
-
-  - name: Open needed ports
-    ansible.builtin.iptables:
-      chain: INPUT
-      protocol: tcp
-      in_interface: eth0
-      jump: ACCEPT
-      destination_ports:
-        - "22"
-        - "443"
-        - "80"
-
-  - name: Set INPUT policy to DROP
-    ansible.builtin.iptables:
-      chain: INPUT
-      policy: DROP
+  roles:
+    - setup_iptables
\ No newline at end of file

From cb3785236daecf1bbe691619943b81ebb366d540 Mon Sep 17 00:00:00 2001
From: Mateo <mdm@athelas.fr>
Date: Tue, 30 Jul 2024 13:40:14 +0200
Subject: [PATCH 3/4] Moved roles

---
 {roles => tasks/roles}/setup_iptables/README.md      | 0
 {roles => tasks/roles}/setup_iptables/meta/main.yml  | 0
 {roles => tasks/roles}/setup_iptables/tasks/main.yml | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename {roles => tasks/roles}/setup_iptables/README.md (100%)
 rename {roles => tasks/roles}/setup_iptables/meta/main.yml (100%)
 rename {roles => tasks/roles}/setup_iptables/tasks/main.yml (100%)

diff --git a/roles/setup_iptables/README.md b/tasks/roles/setup_iptables/README.md
similarity index 100%
rename from roles/setup_iptables/README.md
rename to tasks/roles/setup_iptables/README.md
diff --git a/roles/setup_iptables/meta/main.yml b/tasks/roles/setup_iptables/meta/main.yml
similarity index 100%
rename from roles/setup_iptables/meta/main.yml
rename to tasks/roles/setup_iptables/meta/main.yml
diff --git a/roles/setup_iptables/tasks/main.yml b/tasks/roles/setup_iptables/tasks/main.yml
similarity index 100%
rename from roles/setup_iptables/tasks/main.yml
rename to tasks/roles/setup_iptables/tasks/main.yml

From d84517026d78d3e9852eef9bf59e6b9eaa2b7609 Mon Sep 17 00:00:00 2001
From: Mateo <mdm@athelas.fr>
Date: Tue, 30 Jul 2024 13:46:11 +0200
Subject: [PATCH 4/4] Added usertwist group

---
 tasks/install_caddy.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tasks/install_caddy.yml b/tasks/install_caddy.yml
index 2ebb729..e3bf652 100644
--- a/tasks/install_caddy.yml
+++ b/tasks/install_caddy.yml
@@ -29,6 +29,10 @@
       src: ../templates/Caddyfile.j2
       dest: /etc/caddy/Caddyfile
 
+  - name: Create the usertwist group
+    ansible.builtin.group:
+      name: usertwist
+
   - name: Create the usertwist user
     ansible.builtin.user:
       name: usertwist