From 0b3d2796a3b3f22a1f0aea30e76b75c0db750cab Mon Sep 17 00:00:00 2001 From: Rene Date: Thu, 17 Feb 2022 21:17:32 +0100 Subject: [PATCH 01/15] starting tasks for jitsimeet --- hosts | 3 ++ roles/jitsimeet/tasks/main.yml | 30 +++++++++++++++++++ roles/jitsimeet/var/main.yml | 2 ++ .../{main.yml => tasks/install_apache.yml} | 0 roles/webserver/tasks/install_nginx.yml | 4 +++ roles/webserver/tasks/main.yml | 12 ++++++++ 6 files changed, 51 insertions(+) create mode 100644 roles/jitsimeet/tasks/main.yml create mode 100644 roles/jitsimeet/var/main.yml rename roles/webserver/{main.yml => tasks/install_apache.yml} (100%) create mode 100644 roles/webserver/tasks/install_nginx.yml create mode 100644 roles/webserver/tasks/main.yml diff --git a/hosts b/hosts index 9e44801..046a292 100644 --- a/hosts +++ b/hosts @@ -60,3 +60,6 @@ development mobile photo_editing video_editing + +[jitsimeet] +debian-test \ No newline at end of file diff --git a/roles/jitsimeet/tasks/main.yml b/roles/jitsimeet/tasks/main.yml new file mode 100644 index 0000000..c923544 --- /dev/null +++ b/roles/jitsimeet/tasks/main.yml @@ -0,0 +1,30 @@ +# Load distro-specific variables +- include_vars: "{{ ansible_distribution }}.yml" + tags: always + +- block: + - debug: + msg: Debug + # import role webserver + - import_role: + name: webserver # required. The name of the role to be executed. + # install software + # - name: jitsimeet | add repo + # apt_repo: + # repo: universe # required. Name of the repository to add or remove. + # state: present # not required. choices: absent;present. Indicates the desired repository state. + # remove_others: no # not required. Remove other then added repositories Used if I(state=present) + # update: yes # not required. Update the package database after changing repositories. + # - name: jitsimeet | adjust limits + # blockinfile: + # path: "/etc/systemd/system.conf" # required. The file to modify. Before Ansible 2.3 this option was only usable as I(dest), I(destfile) and I(name). + # block: | # not required. The text to insert inside the marker lines. If it is missing or an empty string, the block will be removed as if C(state) were specified to C(absent). + # DefaultLimitNOFILE=65000 + # DefaultLimitNPROC=65000 + # DefaultTasksMax=65000 + # - name: jitsimeet | reload systemd + # systemd: + # daemon_reload: true # not required. Run daemon-reload before doing any other operations, to make sure systemd has read any changes. When set to C(yes), runs daemon-reload even if the module does not start or stop anything. + + rescue: + - set_fact: task_failed=true diff --git a/roles/jitsimeet/var/main.yml b/roles/jitsimeet/var/main.yml new file mode 100644 index 0000000..012e767 --- /dev/null +++ b/roles/jitsimeet/var/main.yml @@ -0,0 +1,2 @@ +webserver: true +nginx: true \ No newline at end of file diff --git a/roles/webserver/main.yml b/roles/webserver/tasks/install_apache.yml similarity index 100% rename from roles/webserver/main.yml rename to roles/webserver/tasks/install_apache.yml diff --git a/roles/webserver/tasks/install_nginx.yml b/roles/webserver/tasks/install_nginx.yml new file mode 100644 index 0000000..c28d115 --- /dev/null +++ b/roles/webserver/tasks/install_nginx.yml @@ -0,0 +1,4 @@ +- name: webserver | nginx | installing nginx + package: + name: nginx + state: latest \ No newline at end of file diff --git a/roles/webserver/tasks/main.yml b/roles/webserver/tasks/main.yml new file mode 100644 index 0000000..eec5ec0 --- /dev/null +++ b/roles/webserver/tasks/main.yml @@ -0,0 +1,12 @@ +# Load distro-specific variables +- include_vars: "{{ ansible_distribution }}.yml" + tags: always + +- block: + - debug: + msg: Debug + # install software + - import_tasks: install_apache.yml + when: "{{ apache }}" is true + - import_tasks: install_nginx.yml + when: "{{ nginx }}" is true \ No newline at end of file From 2463fc198da983261dfe996adcf1f0aba4028b6d Mon Sep 17 00:00:00 2001 From: Rene Date: Thu, 17 Feb 2022 21:38:18 +0100 Subject: [PATCH 02/15] changed "when" statement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit if using '{{}}’, you need to quote the whole line --- roles/webserver/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/webserver/tasks/main.yml b/roles/webserver/tasks/main.yml index eec5ec0..2f52bf2 100644 --- a/roles/webserver/tasks/main.yml +++ b/roles/webserver/tasks/main.yml @@ -7,6 +7,6 @@ msg: Debug # install software - import_tasks: install_apache.yml - when: "{{ apache }}" is true + when: "{{ apache }} == true" - import_tasks: install_nginx.yml - when: "{{ nginx }}" is true \ No newline at end of file + when: "{{ nginx }} == true" \ No newline at end of file From a6a1979f8a866daba5dd2645f242ef798187732d Mon Sep 17 00:00:00 2001 From: Rene Date: Thu, 17 Feb 2022 21:42:45 +0100 Subject: [PATCH 03/15] each webserver needs certificates so a task for installing came was added --- roles/webserver/tasks/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/roles/webserver/tasks/main.yml b/roles/webserver/tasks/main.yml index 2f52bf2..fc458ab 100644 --- a/roles/webserver/tasks/main.yml +++ b/roles/webserver/tasks/main.yml @@ -9,4 +9,8 @@ - import_tasks: install_apache.yml when: "{{ apache }} == true" - import_tasks: install_nginx.yml - when: "{{ nginx }} == true" \ No newline at end of file + when: "{{ nginx }} == true" + - name: webserver | acme | install acme + package: + name: acme + state: latest \ No newline at end of file From b1d25b4f89da24786882244b047b2da971b7637c Mon Sep 17 00:00:00 2001 From: Rene Date: Thu, 17 Feb 2022 21:54:01 +0100 Subject: [PATCH 04/15] namechange --- hosts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts b/hosts index 046a292..4c20271 100644 --- a/hosts +++ b/hosts @@ -62,4 +62,4 @@ photo_editing video_editing [jitsimeet] -debian-test \ No newline at end of file +ubuntu-test \ No newline at end of file From 43deef0bbf7efa66b48fd75d681084bf6947eed0 Mon Sep 17 00:00:00 2001 From: Rene Date: Thu, 17 Feb 2022 21:59:56 +0100 Subject: [PATCH 05/15] testing "webserver" --- hosts | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts b/hosts index 4c20271..6f934a8 100644 --- a/hosts +++ b/hosts @@ -54,6 +54,7 @@ tuxedo-book-xp1511.universe.local coruscant.universe.local mewimeet.de mewitoot.de +ubuntu-test [workstation:children] development From dc4b30186e30524f533da9019a764e86e0a6068c Mon Sep 17 00:00:00 2001 From: Rene Date: Thu, 17 Feb 2022 22:07:43 +0100 Subject: [PATCH 06/15] Webserver host vars added --- roles/base/vars/zsh.yml | 0 roles/webserver/tasks/install_nginx.yml | 2 +- roles/webserver/vars/Ubuntu.yml | 3 +++ 3 files changed, 4 insertions(+), 1 deletion(-) delete mode 100644 roles/base/vars/zsh.yml create mode 100644 roles/webserver/vars/Ubuntu.yml diff --git a/roles/base/vars/zsh.yml b/roles/base/vars/zsh.yml deleted file mode 100644 index e69de29..0000000 diff --git a/roles/webserver/tasks/install_nginx.yml b/roles/webserver/tasks/install_nginx.yml index c28d115..9edbe79 100644 --- a/roles/webserver/tasks/install_nginx.yml +++ b/roles/webserver/tasks/install_nginx.yml @@ -1,4 +1,4 @@ - name: webserver | nginx | installing nginx package: - name: nginx + name: "{{ nginx_package }}" state: latest \ No newline at end of file diff --git a/roles/webserver/vars/Ubuntu.yml b/roles/webserver/vars/Ubuntu.yml new file mode 100644 index 0000000..192fe16 --- /dev/null +++ b/roles/webserver/vars/Ubuntu.yml @@ -0,0 +1,3 @@ +apache_package: apache2 +nginx_package: nginx +acme_package: acme \ No newline at end of file From f72efdb7f03566ab50976447b594d5d8216aeafe Mon Sep 17 00:00:00 2001 From: Rene Date: Thu, 17 Feb 2022 22:15:55 +0100 Subject: [PATCH 07/15] =?UTF-8?q?m=C3=A4h?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- host_vars/ubuntu-test.universe.local.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/host_vars/ubuntu-test.universe.local.yml b/host_vars/ubuntu-test.universe.local.yml index 5d29e2b..2680404 100644 --- a/host_vars/ubuntu-test.universe.local.yml +++ b/host_vars/ubuntu-test.universe.local.yml @@ -1,2 +1,4 @@ --- netdata: true +webserver: true +nginx: true \ No newline at end of file From 9267c3b723c834c3d29999bfd68a6e9d1246529a Mon Sep 17 00:00:00 2001 From: Rene Date: Thu, 17 Feb 2022 22:20:21 +0100 Subject: [PATCH 08/15] no jinja 2 templates in conditions --- roles/webserver/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/webserver/tasks/main.yml b/roles/webserver/tasks/main.yml index fc458ab..feb909d 100644 --- a/roles/webserver/tasks/main.yml +++ b/roles/webserver/tasks/main.yml @@ -7,9 +7,9 @@ msg: Debug # install software - import_tasks: install_apache.yml - when: "{{ apache }} == true" + when: apache == true - import_tasks: install_nginx.yml - when: "{{ nginx }} == true" + when: nginx == true - name: webserver | acme | install acme package: name: acme From ed7d7a791c5e6a3e78d5c1ca507c953e6f126bb0 Mon Sep 17 00:00:00 2001 From: Rene Date: Thu, 17 Feb 2022 22:29:07 +0100 Subject: [PATCH 09/15] added role jitsimeet --- hosts | 1 - local.yml | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hosts b/hosts index 6f934a8..4c20271 100644 --- a/hosts +++ b/hosts @@ -54,7 +54,6 @@ tuxedo-book-xp1511.universe.local coruscant.universe.local mewimeet.de mewitoot.de -ubuntu-test [workstation:children] development diff --git a/local.yml b/local.yml index 0a9733d..96b15dc 100644 --- a/local.yml +++ b/local.yml @@ -78,6 +78,12 @@ roles: - printspooler +- hosts: jitsimeet + tags: server,jitsimeet,webserver + become: true + roles: + - jitsimeet + - hosts: proxyserver tags: server,proxyserver become: true From 418b461d43ac8ce4b6c1f9fb88a1a3db5a88dc3a Mon Sep 17 00:00:00 2001 From: Rene Date: Thu, 17 Feb 2022 22:45:29 +0100 Subject: [PATCH 10/15] corrected syntax for import_role --- roles/jitsimeet/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/jitsimeet/tasks/main.yml b/roles/jitsimeet/tasks/main.yml index c923544..beeded7 100644 --- a/roles/jitsimeet/tasks/main.yml +++ b/roles/jitsimeet/tasks/main.yml @@ -7,7 +7,7 @@ msg: Debug # import role webserver - import_role: - name: webserver # required. The name of the role to be executed. + name: webserver # required. The name of the role to be executed. # install software # - name: jitsimeet | add repo # apt_repo: From 76a1c1ab96e97c8dcd99d442269288dac347a777 Mon Sep 17 00:00:00 2001 From: Rene Date: Thu, 17 Feb 2022 22:51:40 +0100 Subject: [PATCH 11/15] added vars file for Ubuntu in role "jitsimeet" --- roles/jitsimeet/var/Ubuntu.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 roles/jitsimeet/var/Ubuntu.yml diff --git a/roles/jitsimeet/var/Ubuntu.yml b/roles/jitsimeet/var/Ubuntu.yml new file mode 100644 index 0000000..8df184b --- /dev/null +++ b/roles/jitsimeet/var/Ubuntu.yml @@ -0,0 +1 @@ +jitsimeet_package: jitsi-meet \ No newline at end of file From 9d919ef73501533c4ba1eb7f60b257e7ae1a159c Mon Sep 17 00:00:00 2001 From: Rene Date: Thu, 17 Feb 2022 22:57:40 +0100 Subject: [PATCH 12/15] corrected dir name --- roles/jitsimeet/{var => vars}/Ubuntu.yml | 0 roles/jitsimeet/{var => vars}/main.yml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename roles/jitsimeet/{var => vars}/Ubuntu.yml (100%) rename roles/jitsimeet/{var => vars}/main.yml (100%) diff --git a/roles/jitsimeet/var/Ubuntu.yml b/roles/jitsimeet/vars/Ubuntu.yml similarity index 100% rename from roles/jitsimeet/var/Ubuntu.yml rename to roles/jitsimeet/vars/Ubuntu.yml diff --git a/roles/jitsimeet/var/main.yml b/roles/jitsimeet/vars/main.yml similarity index 100% rename from roles/jitsimeet/var/main.yml rename to roles/jitsimeet/vars/main.yml From c044bdca5c66819d5a0cff5933e20a11af4a08ce Mon Sep 17 00:00:00 2001 From: Rene Date: Thu, 17 Feb 2022 23:05:17 +0100 Subject: [PATCH 13/15] add repo --- roles/jitsimeet/tasks/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/jitsimeet/tasks/main.yml b/roles/jitsimeet/tasks/main.yml index beeded7..bcb76ac 100644 --- a/roles/jitsimeet/tasks/main.yml +++ b/roles/jitsimeet/tasks/main.yml @@ -9,12 +9,12 @@ - import_role: name: webserver # required. The name of the role to be executed. # install software - # - name: jitsimeet | add repo - # apt_repo: - # repo: universe # required. Name of the repository to add or remove. - # state: present # not required. choices: absent;present. Indicates the desired repository state. - # remove_others: no # not required. Remove other then added repositories Used if I(state=present) - # update: yes # not required. Update the package database after changing repositories. + - name: jitsimeet | add repo + apt_repo: + repo: universe # required. Name of the repository to add or remove. + state: present # not required. choices: absent;present. Indicates the desired repository state. + remove_others: no # not required. Remove other then added repositories Used if I(state=present) + update: yes # not required. Update the package database after changing repositories. # - name: jitsimeet | adjust limits # blockinfile: # path: "/etc/systemd/system.conf" # required. The file to modify. Before Ansible 2.3 this option was only usable as I(dest), I(destfile) and I(name). From 2cee06aab817ca225d24c375ebc1c433c1402efd Mon Sep 17 00:00:00 2001 From: Rene Date: Thu, 17 Feb 2022 23:11:18 +0100 Subject: [PATCH 14/15] switched from apt_repo to apt_repository --- roles/jitsimeet/tasks/main.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/roles/jitsimeet/tasks/main.yml b/roles/jitsimeet/tasks/main.yml index bcb76ac..ed0cae5 100644 --- a/roles/jitsimeet/tasks/main.yml +++ b/roles/jitsimeet/tasks/main.yml @@ -10,11 +10,10 @@ name: webserver # required. The name of the role to be executed. # install software - name: jitsimeet | add repo - apt_repo: - repo: universe # required. Name of the repository to add or remove. - state: present # not required. choices: absent;present. Indicates the desired repository state. - remove_others: no # not required. Remove other then added repositories Used if I(state=present) - update: yes # not required. Update the package database after changing repositories. + apt_repository: + repo: universe + state: present + update_cache: yes # - name: jitsimeet | adjust limits # blockinfile: # path: "/etc/systemd/system.conf" # required. The file to modify. Before Ansible 2.3 this option was only usable as I(dest), I(destfile) and I(name). From 4d9e5a60d1be2aabfae927de236df610da48dd27 Mon Sep 17 00:00:00 2001 From: Rene Date: Thu, 17 Feb 2022 23:16:23 +0100 Subject: [PATCH 15/15] multiple changes removed adding ofrepo universe added task for adjusting limits added task for reloading systemd --- roles/jitsimeet/tasks/main.yml | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/roles/jitsimeet/tasks/main.yml b/roles/jitsimeet/tasks/main.yml index ed0cae5..f489960 100644 --- a/roles/jitsimeet/tasks/main.yml +++ b/roles/jitsimeet/tasks/main.yml @@ -9,21 +9,16 @@ - import_role: name: webserver # required. The name of the role to be executed. # install software - - name: jitsimeet | add repo - apt_repository: - repo: universe - state: present - update_cache: yes - # - name: jitsimeet | adjust limits - # blockinfile: - # path: "/etc/systemd/system.conf" # required. The file to modify. Before Ansible 2.3 this option was only usable as I(dest), I(destfile) and I(name). - # block: | # not required. The text to insert inside the marker lines. If it is missing or an empty string, the block will be removed as if C(state) were specified to C(absent). - # DefaultLimitNOFILE=65000 - # DefaultLimitNPROC=65000 - # DefaultTasksMax=65000 - # - name: jitsimeet | reload systemd - # systemd: - # daemon_reload: true # not required. Run daemon-reload before doing any other operations, to make sure systemd has read any changes. When set to C(yes), runs daemon-reload even if the module does not start or stop anything. + - name: jitsimeet | adjust limits + blockinfile: + path: "/etc/systemd/system.conf" # required. The file to modify. Before Ansible 2.3 this option was only usable as I(dest), I(destfile) and I(name). + block: | # not required. The text to insert inside the marker lines. If it is missing or an empty string, the block will be removed as if C(state) were specified to C(absent). + DefaultLimitNOFILE=65000 + DefaultLimitNPROC=65000 + DefaultTasksMax=65000 + - name: jitsimeet | reload systemd + systemd: + daemon_reload: true # not required. Run daemon-reload before doing any other operations, to make sure systemd has read any changes. When set to C(yes), runs daemon-reload even if the module does not start or stop anything. rescue: - set_fact: task_failed=true