From 52166bc711b30f1565ecedc245c43463c7406270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christer=20War=C3=A9n?= <cwchristerw@gmail.com>
Date: Thu, 18 Apr 2024 16:00:47 +0300
Subject: [PATCH] Update

---
 tasks/deployer.yml | 15 ---------------
 tasks/install.yml  | 11 +++--------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/tasks/deployer.yml b/tasks/deployer.yml
index f181fa3..57b7e32 100644
--- a/tasks/deployer.yml
+++ b/tasks/deployer.yml
@@ -42,8 +42,6 @@
     name: docker.io/mariadb
     tag: latest
   register: deployerTask101
-  when:
-    - ansible_facts.fqdn == "divari.northeurope.cloudapp.azure.com"
 
 - name: "Deployer - MariaDB - Run Container"
   containers.podman.podman_container:
@@ -59,7 +57,6 @@
       MYSQL_ROOT_PASSWORD: "y9ZmTmUKLaRrZ4SA"
   register: deployerTask102
   when:
-    - ansible_facts.fqdn == "divari.northeurope.cloudapp.azure.com"
     - (deployerTask101 is defined and deployerTask101.changed) or deployerTask101 is undefined
   tags:
     - mariadb
@@ -70,7 +67,6 @@
     port: "3306"
     delay: 10
   when:
-    - ansible_facts.fqdn == "divari.northeurope.cloudapp.azure.com"
     - (deployerTask102 is defined and deployerTask102.changed) or deployerTask102 is undefined
   tags:
     - mariadb
@@ -83,7 +79,6 @@
 #   ignore_errors: yes
 #   changed_when: task.stdout.find("This installation of MariaDB is already upgraded") == -1
 #   when:
-#     - ansible_facts.fqdn == "divari.northeurope.cloudapp.azure.com"
 #     - (deployerTask102 is defined and deployerTask102.changed) or deployerTask102 is undefined
 #   tags:
 #     - mariadb
@@ -100,7 +95,6 @@
   vars:
     ansible_python_interpreter: "/opt/ansible/bin/python3"
   when:
-    - ansible_facts.fqdn == "divari.northeurope.cloudapp.azure.com"
     - (deployerTask102 is defined and deployerTask102.changed) or deployerTask102 is undefined
   tags:
     - mariadb
@@ -114,7 +108,6 @@
   vars:
     ansible_python_interpreter: "/opt/ansible/bin/python3"
   when:
-    - ansible_facts.fqdn == "divari.northeurope.cloudapp.azure.com"
     - (deployerTask102 is defined and deployerTask102.changed) or deployerTask102 is undefined
   tags:
     - mariadb
@@ -180,8 +173,6 @@
     dest: /root/backend
     version: main
   register: deployerTask521
-  when:
-    - ansible_facts.fqdn == "divari.northeurope.cloudapp.azure.com"
 
 - name: "Deployer - Backend - Build Image"
   containers.podman.podman_image:
@@ -197,7 +188,6 @@
   become_user: root
   register: deployerTask522
   when:
-    - ansible_facts.fqdn == "divari.northeurope.cloudapp.azure.com"
     - (deployerTask521 is defined and deployerTask521.changed) or deployerTask521 is undefined
   tags:
     - backend
@@ -215,7 +205,6 @@
     restart_policy: always
     command: "npm start"
   when:
-    - ansible_facts.fqdn == "divari.northeurope.cloudapp.azure.com"
     - deployerTask522 is defined
     - deployerTask522.changed
   tags:
@@ -227,8 +216,6 @@
     dest: /root/frontend
     version: main
   register: deployerTask531
-  when:
-    - ansible_facts.fqdn == "divari.northeurope.cloudapp.azure.com"
 
 - name: "Deployer - Frontend - Build Image"
   containers.podman.podman_image:
@@ -244,7 +231,6 @@
   become_user: root
   register: deployerTask532
   when:
-    - ansible_facts.fqdn == "divari.northeurope.cloudapp.azure.com"
     - (deployerTask531 is defined and deployerTask531.changed) or deployerTask531 is undefined
   tags:
     - frontend
@@ -262,7 +248,6 @@
     restart_policy: always
     command: "npm run build"
   when:
-    - ansible_facts.fqdn == "divari.northeurope.cloudapp.azure.com"
     - deployerTask532 is defined
     - deployerTask532.changed
   tags:
diff --git a/tasks/install.yml b/tasks/install.yml
index f038ae2..270310f 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -89,8 +89,6 @@
     extra_args: --upgrade
     virtualenv: /opt/ansible
     virtualenv_command: "python3 -m venv"
-  when:
-    - ansible_facts.fqdn == "divari.northeurope.cloudapp.azure.com"
   tags:
     - certbot
 
@@ -106,8 +104,6 @@
   loop_control:
     label: "{{ binary }}"
     loop_var: "binary"
-  when:
-    - ansible_facts.fqdn == "divari.northeurope.cloudapp.azure.com"
   tags:
     - certbot
 
@@ -117,11 +113,10 @@
 #   changed_when: task.stdout.find("Certificate not yet due for renewal; no action taken.") == -1
 #   vars:
 #     cert:
-#       name: musix
-#       email: musixdiscordbot@gmail.com
+#       name: mpp
+#       email: matias.martikainen@metropolia.fi
 #       domains:
-#         - musix-org.com
-#         - "*.musix-org.com"
+#         - "{{ ansible_facts.fqdn }}"
 #   tags:
 #     - certbot