diff --git a/group_vars/all.yml b/group_vars/all.yml index 00855ed..52e5f65 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -10,9 +10,10 @@ user_mgmt_default: genofire: ssh_key: present: - - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDZm0TZPBzgXrY1vrLoYviNRb/oGZQDQk9vrppPK84sN55ZPlr9VvP+JYE7Qkx8teRuH9ulxqX40+dxKaiAXMUl4HU57KPLjwCb7SnBNIFTv6ZHGxPS8ZgUzKJr4Agph51oenNEO3RziEqAo3EwK67SGnjeIYQQKcjpfwd08+PYMOjv42zSYQ9umooj5LooOvbxoogZ3VpboXv6DeyA4rev1M9RgnMWaWVF2LxJjQ3jVr7xh1vZktVGKuVk/XXKD6WVAuwmGMVEouQzjtG9kepWd8FUYe+fgj5mtdqfeQP9CypxvOcb7jT20wO1Abpp5udS9iPDQHg+lafklIAeKG3qgxxhBDH3otXtnWcoeXUmDpBI8HU/8d/yrGaLHYRfy3HHiSGFq3lBgoxi83QIOl9ELeKWMJC0fWKBApm0NU0flgwfy2j7GRyXmlM7tVFyuj5RTAZNQfgD9g054di9WbtUs7sm/9r3/rQe2+3neE3Jskt4xvZK0xbc4dZSZGn4E2JDWjENqPBvQ2dU5lsjpUKTZWAnxVGPe//BErsDxNLIHWz8emG71r3Q2yud4KPdAR9CgeC8g1bwlCI6JDFZutKBzIlE3QQ4ryKJEioiUL89xi6G+nNB7W5ABsQN0ZtWvZl8TG4Wh00B+oBXzgRER5Y9SdAYcrwWxlGVxxQyElUNrw== genofire-yubikey" - - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH8LdgjUiL/MFmA2wM98QAbUEyY/8ixnpettC6kQxKWu genofire@emma.ccchb.de" - absent: [] + - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIOr9wE3i1+Cl/06WOf0/6OjxsOnN7veV3LZcWgtHkcS genofire@fireYubi" + absent: + - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH8LdgjUiL/MFmA2wM98QAbUEyY/8ixnpettC6kQxKWu genofire@emma.ccchb.de" + - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDZm0TZPBzgXrY1vrLoYviNRb/oGZQDQk9vrppPK84sN55ZPlr9VvP+JYE7Qkx8teRuH9ulxqX40+dxKaiAXMUl4HU57KPLjwCb7SnBNIFTv6ZHGxPS8ZgUzKJr4Agph51oenNEO3RziEqAo3EwK67SGnjeIYQQKcjpfwd08+PYMOjv42zSYQ9umooj5LooOvbxoogZ3VpboXv6DeyA4rev1M9RgnMWaWVF2LxJjQ3jVr7xh1vZktVGKuVk/XXKD6WVAuwmGMVEouQzjtG9kepWd8FUYe+fgj5mtdqfeQP9CypxvOcb7jT20wO1Abpp5udS9iPDQHg+lafklIAeKG3qgxxhBDH3otXtnWcoeXUmDpBI8HU/8d/yrGaLHYRfy3HHiSGFq3lBgoxi83QIOl9ELeKWMJC0fWKBApm0NU0flgwfy2j7GRyXmlM7tVFyuj5RTAZNQfgD9g054di9WbtUs7sm/9r3/rQe2+3neE3Jskt4xvZK0xbc4dZSZGn4E2JDWjENqPBvQ2dU5lsjpUKTZWAnxVGPe//BErsDxNLIHWz8emG71r3Q2yud4KPdAR9CgeC8g1bwlCI6JDFZutKBzIlE3QQ4ryKJEioiUL89xi6G+nNB7W5ABsQN0ZtWvZl8TG4Wh00B+oBXzgRER5Y9SdAYcrwWxlGVxxQyElUNrw== genofire-yubikey" fritz: ssh_key: present: @@ -24,3 +25,8 @@ user_mgmt_default: present: - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBz7TX/Nm+tE/8RZ2XLuboFWUmBR0oCD0yTaRm2NILm3 deelkar@artena" absent: [] + humm: + ssh_key: + present: + - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDSHkU00aO4U98ikMiiiWiEeRj/597UzFcFctwY8iwLy humm@fluorine" + absent: [] diff --git a/host_vars/cloud.emma.ccchb.de.yml b/host_vars/cloud.emma.ccchb.de.yml index 7346f73..190575a 100644 --- a/host_vars/cloud.emma.ccchb.de.yml +++ b/host_vars/cloud.emma.ccchb.de.yml @@ -16,3 +16,6 @@ user_mgmt: genofire: state: present groups: sudo + humm: + state: present + groups: sudo diff --git a/host_vars/dn42.emma.ccchb.de.yml b/host_vars/dn42.emma.ccchb.de.yml index 9f4c5c6..f1b8d14 100644 --- a/host_vars/dn42.emma.ccchb.de.yml +++ b/host_vars/dn42.emma.ccchb.de.yml @@ -10,3 +10,6 @@ user_mgmt: fritz: state: present groups: sudo + humm: + state: present + groups: sudo diff --git a/host_vars/gitea.emma.ccchb.de.yml b/host_vars/gitea.emma.ccchb.de.yml index 14aa7a7..84d41d7 100644 --- a/host_vars/gitea.emma.ccchb.de.yml +++ b/host_vars/gitea.emma.ccchb.de.yml @@ -1,6 +1,6 @@ vm_index: 2 -gitea_version: "1.13.0" +gitea_version: "1.17.1" gitea_app_name: "dev.ccchb.de" # technical: @@ -14,7 +14,7 @@ gitea_systemd_cap_net_bind_service: true gitea_http_letsencrypt_mail: "webmaster@ccchb.de" gitea_ssh_domain: "dev.ccchb.de" -gitea_ssh_listen: "[::]" +gitea_ssh_listen: "::" gitea_ssh_port: 2222 gitea_start_ssh: true @@ -42,3 +42,6 @@ user_mgmt: genofire: state: present groups: sudo + humm: + state: present + groups: sudo diff --git a/host_vars/jabber.emma.ccchb.de.yml b/host_vars/jabber.emma.ccchb.de.yml index e73c38e..fbffec0 100644 --- a/host_vars/jabber.emma.ccchb.de.yml +++ b/host_vars/jabber.emma.ccchb.de.yml @@ -10,3 +10,6 @@ user_mgmt: fritz: state: present groups: sudo + humm: + state: present + groups: sudo diff --git a/host_vars/wiki.emma.ccchb.de.yml b/host_vars/wiki.emma.ccchb.de.yml index 05f727a..fc63237 100644 --- a/host_vars/wiki.emma.ccchb.de.yml +++ b/host_vars/wiki.emma.ccchb.de.yml @@ -10,6 +10,9 @@ user_mgmt: fritz: state: present groups: sudo + humm: + state: present + groups: sudo certbot_certs: - [ "wiki.ccchb.de" ] diff --git a/roles/gitea b/roles/gitea index 1aa082a..751d0d7 160000 --- a/roles/gitea +++ b/roles/gitea @@ -1 +1 @@ -Subproject commit 1aa082a2101c69f8cfc13a31604991b0c3dfa8e5 +Subproject commit 751d0d724ba63c6251fafad9e80a480d6bc5043f diff --git a/roles/gitea-ccchb/files/templates/base/head.tmpl b/roles/gitea-ccchb/files/templates/base/head.tmpl deleted file mode 100644 index bca7bb9..0000000 --- a/roles/gitea-ccchb/files/templates/base/head.tmpl +++ /dev/null @@ -1,172 +0,0 @@ - - - - - - - {{if .Title}}{{.Title | RenderEmojiPlain}} - {{end}} {{if .Repository.Name}}{{.Repository.Name}} - {{end}}{{AppName}} - - - - - - - - {{if .IsSigned}} - - {{end}} - {{if .ContextUser}} - - {{end}} - {{if .SearchLimit}} - - {{end}} -{{if .GoGetImport}} - - -{{end}} - - - - - - -{{if .RequireSimpleMDE}} - -{{end}} - -{{if .RequireTribute}} - -{{end}} - - - -{{if .RequireMinicolors}} - -{{end}} - -{{if .PageIsUserProfile}} - - - - - {{if .Owner.Description}} - - {{end}} -{{else if .Repository}} - {{if .Issue}} - - - {{if .Issue.Content}} - - {{end}} - {{else}} - - - {{if .Repository.Description}} - - {{end}} - {{end}} - - -{{else}} - - - - - -{{end}} - -{{if .IsSigned }} - {{ if ne .SignedUser.Theme "gitea" }} - - {{end}} -{{else if ne DefaultTheme "gitea"}} - -{{end}} -{{template "custom/header" .}} - - - {{template "custom/body_outer_pre" .}} - -
- - - {{template "custom/body_inner_pre" .}} - - {{if not .PageIsInstall}} - - {{end}} -{{/* -
- - -*/}}