From 83cd6180085788e0320755a06d5a23ad7295f3b9 Mon Sep 17 00:00:00 2001 From: L3D Date: Wed, 10 May 2023 00:22:07 +0200 Subject: [PATCH 1/2] Use gitea as collection l3d.git --- .gitmodules | 7 +++---- .yamllint | 1 + collections/ansible_collections/community/general | 2 +- collections/ansible_collections/community/mysql | 2 +- collections/ansible_collections/l3d/git | 1 + roles/do1jlr.gitea | 1 - roles/robertdebock.dovecot | 2 +- roles/robertdebock.fail2ban | 2 +- site.yml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) create mode 160000 collections/ansible_collections/l3d/git delete mode 160000 roles/do1jlr.gitea diff --git a/.gitmodules b/.gitmodules index 1cb2d39..f4df502 100644 --- a/.gitmodules +++ b/.gitmodules @@ -42,10 +42,6 @@ path = roles/robertdebock.dovecot url = https://github.com/robertdebock/ansible-role-dovecot.git branch = master -[submodule "roles/gitea"] - path = roles/do1jlr.gitea - url = https://github.com/roles-ansible/ansible_role_gitea.git - branch = main [submodule "roles/geerlingguy.postgresql"] path = roles/geerlingguy.postgresql url = https://github.com/geerlingguy/ansible-role-postgresql.git @@ -127,3 +123,6 @@ [submodule "collections/ansible_collections/community/crypto"] path = collections/ansible_collections/community/crypto url = https://github.com/ansible-collections/community.crypto.git +[submodule "collections/ansible_collections/l3d/git"] + path = collections/ansible_collections/l3d/git + url = https://github.com/roles-ansible/ansible_collection_git.git diff --git a/.yamllint b/.yamllint index eadb400..3a9ae97 100644 --- a/.yamllint +++ b/.yamllint @@ -15,3 +15,4 @@ ignore: | group_vars/all/vault.yml roles/ ansible/ + collections/ diff --git a/collections/ansible_collections/community/general b/collections/ansible_collections/community/general index 57cfd1b..f833982 160000 --- a/collections/ansible_collections/community/general +++ b/collections/ansible_collections/community/general @@ -1 +1 @@ -Subproject commit 57cfd1b46d44ba6ca64206f4606f3bdea3ef3a82 +Subproject commit f833982d6f686063288b9be2c3721aac8d35d521 diff --git a/collections/ansible_collections/community/mysql b/collections/ansible_collections/community/mysql index 30a2015..04e197f 160000 --- a/collections/ansible_collections/community/mysql +++ b/collections/ansible_collections/community/mysql @@ -1 +1 @@ -Subproject commit 30a2015f6cef3863e8104402485edc362ffb96df +Subproject commit 04e197fe5555ea1a1343d9777474a64b3fca87c4 diff --git a/collections/ansible_collections/l3d/git b/collections/ansible_collections/l3d/git new file mode 160000 index 0000000..904e377 --- /dev/null +++ b/collections/ansible_collections/l3d/git @@ -0,0 +1 @@ +Subproject commit 904e3773fe4e6ed095ae68879b1142956276dd02 diff --git a/roles/do1jlr.gitea b/roles/do1jlr.gitea deleted file mode 160000 index 16a304b..0000000 --- a/roles/do1jlr.gitea +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 16a304b7010decb12672ac724a31057d34a2b886 diff --git a/roles/robertdebock.dovecot b/roles/robertdebock.dovecot index 9bde46f..2de0e07 160000 --- a/roles/robertdebock.dovecot +++ b/roles/robertdebock.dovecot @@ -1 +1 @@ -Subproject commit 9bde46faa1096607fa75570ea510b1130c05b099 +Subproject commit 2de0e0708d3625e16ee8e1044766d675d6b8ec34 diff --git a/roles/robertdebock.fail2ban b/roles/robertdebock.fail2ban index 53ed080..edf6baa 160000 --- a/roles/robertdebock.fail2ban +++ b/roles/robertdebock.fail2ban @@ -1 +1 @@ -Subproject commit 53ed080ab4a78b103de658a076e3d2f2ad4c3756 +Subproject commit edf6baa7e539376fc226e9bca7cf8dc7386338b3 diff --git a/site.yml b/site.yml index c95e18d..61651ef 100644 --- a/site.yml +++ b/site.yml @@ -35,7 +35,7 @@ hosts: web roles: - {role: do1jlr.mysql, tags: [web, git, mysql], become: true} - - {role: do1jlr.gitea, tags: [web, gitea, git]} + - {role: l3d.git.gitea, tags: [web, gitea, git]} - name: Deploy dns resolver hosts: resolver From 9f94101bcc1aaad1367de127773c9429c87d4ecc Mon Sep 17 00:00:00 2001 From: L3D Date: Wed, 10 May 2023 00:23:35 +0200 Subject: [PATCH 2/2] enable actions --- host_vars/web01.l3d.space/vars.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/host_vars/web01.l3d.space/vars.yml b/host_vars/web01.l3d.space/vars.yml index a671f2c..a13e649 100644 --- a/host_vars/web01.l3d.space/vars.yml +++ b/host_vars/web01.l3d.space/vars.yml @@ -208,6 +208,8 @@ gitea_start_ssh: "{{ _gitea_start_ssh }}" gitea_ssh_port: 22 gitea_require_signin: false gitea_password_check_pwn: true +gitea_actions_enabled: true +gitea_actions_default_actions_url: 'https://backwesen.de/' # gitea db gitea_db_type: mysql