From 7ee57d81eadd86d83e9e8627ee87d616006dae56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torma=20Krist=C3=B3f?= Date: Sat, 5 Feb 2022 19:28:20 +0100 Subject: [PATCH] fix main in tasks --- .../tasks/{backupscript.yaml => main.yaml} | 0 roles/common/tasks/main.yaml | 11 +++++++++++ roles/docker/tasks/{docker.yaml => main.yaml} | 0 roles/internalsmtp/tasks/{postfix.yaml => main.yaml} | 0 roles/mariadb/tasks/{mariadb.yaml => main.yaml} | 0 roles/mountpoint/tasks/{mountpoint.yaml => main.yaml} | 0 roles/postgresql/tasks/{postgresql.yaml => main.yaml} | 0 roles/smtpgateway/tasks/{postfix.yaml => main.yaml} | 0 roles/webgateway/tasks/{apache.yaml => main.yaml} | 0 roles/webserver/tasks/{apache.yaml => main.yaml} | 0 10 files changed, 11 insertions(+) rename roles/backupscript/tasks/{backupscript.yaml => main.yaml} (100%) create mode 100644 roles/common/tasks/main.yaml rename roles/docker/tasks/{docker.yaml => main.yaml} (100%) rename roles/internalsmtp/tasks/{postfix.yaml => main.yaml} (100%) rename roles/mariadb/tasks/{mariadb.yaml => main.yaml} (100%) rename roles/mountpoint/tasks/{mountpoint.yaml => main.yaml} (100%) rename roles/postgresql/tasks/{postgresql.yaml => main.yaml} (100%) rename roles/smtpgateway/tasks/{postfix.yaml => main.yaml} (100%) rename roles/webgateway/tasks/{apache.yaml => main.yaml} (100%) rename roles/webserver/tasks/{apache.yaml => main.yaml} (100%) diff --git a/roles/backupscript/tasks/backupscript.yaml b/roles/backupscript/tasks/main.yaml similarity index 100% rename from roles/backupscript/tasks/backupscript.yaml rename to roles/backupscript/tasks/main.yaml diff --git a/roles/common/tasks/main.yaml b/roles/common/tasks/main.yaml new file mode 100644 index 0000000..f50a741 --- /dev/null +++ b/roles/common/tasks/main.yaml @@ -0,0 +1,11 @@ +--- +- include_tasks: static-networking.yaml +- include_tasks: apt.yaml +- include_tasks: clean-motd.yaml +- include_tasks: remove-snap.yaml +- include_tasks: disable-cloudinit.yaml +- include_tasks: firewalld.yaml +- include_tasks: service-user.yaml +- include_tasks: ssh-security-settings.yaml +- include_tasks: ssh-security-settings.yaml +- include_tasks: timesync.yaml \ No newline at end of file diff --git a/roles/docker/tasks/docker.yaml b/roles/docker/tasks/main.yaml similarity index 100% rename from roles/docker/tasks/docker.yaml rename to roles/docker/tasks/main.yaml diff --git a/roles/internalsmtp/tasks/postfix.yaml b/roles/internalsmtp/tasks/main.yaml similarity index 100% rename from roles/internalsmtp/tasks/postfix.yaml rename to roles/internalsmtp/tasks/main.yaml diff --git a/roles/mariadb/tasks/mariadb.yaml b/roles/mariadb/tasks/main.yaml similarity index 100% rename from roles/mariadb/tasks/mariadb.yaml rename to roles/mariadb/tasks/main.yaml diff --git a/roles/mountpoint/tasks/mountpoint.yaml b/roles/mountpoint/tasks/main.yaml similarity index 100% rename from roles/mountpoint/tasks/mountpoint.yaml rename to roles/mountpoint/tasks/main.yaml diff --git a/roles/postgresql/tasks/postgresql.yaml b/roles/postgresql/tasks/main.yaml similarity index 100% rename from roles/postgresql/tasks/postgresql.yaml rename to roles/postgresql/tasks/main.yaml diff --git a/roles/smtpgateway/tasks/postfix.yaml b/roles/smtpgateway/tasks/main.yaml similarity index 100% rename from roles/smtpgateway/tasks/postfix.yaml rename to roles/smtpgateway/tasks/main.yaml diff --git a/roles/webgateway/tasks/apache.yaml b/roles/webgateway/tasks/main.yaml similarity index 100% rename from roles/webgateway/tasks/apache.yaml rename to roles/webgateway/tasks/main.yaml diff --git a/roles/webserver/tasks/apache.yaml b/roles/webserver/tasks/main.yaml similarity index 100% rename from roles/webserver/tasks/apache.yaml rename to roles/webserver/tasks/main.yaml