From 5662be94786947051e59b3af3f0af7f1375a4185 Mon Sep 17 00:00:00 2001 From: genofire Date: Sun, 21 Aug 2022 13:02:50 +0200 Subject: [PATCH] fix(gitea): update to v1.17.1 - security --- host_vars/gitea.emma.ccchb.de.yml | 4 +- roles/gitea | 2 +- .../files/templates/base/head.tmpl | 162 +++++------------- 3 files changed, 46 insertions(+), 122 deletions(-) diff --git a/host_vars/gitea.emma.ccchb.de.yml b/host_vars/gitea.emma.ccchb.de.yml index 14aa7a7..11ece9a 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 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 index bca7bb9..a331623 100644 --- a/roles/gitea-ccchb/files/templates/base/head.tmpl +++ b/roles/gitea-ccchb/files/templates/base/head.tmpl @@ -1,154 +1,76 @@ - - + + - - {{if .Title}}{{.Title | RenderEmojiPlain}} - {{end}} {{if .Repository.Name}}{{.Repository.Name}} - {{end}}{{AppName}} - + {{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}} - +{{if .FeedURL}} + + {{end}} - -{{if .RequireTribute}} - -{{end}} - - + + + + {{template "base/head_script" .}} -{{if .RequireMinicolors}} - -{{end}} - {{if .PageIsUserProfile}} - - - - + + + + {{if .Owner.Description}} {{end}} {{else if .Repository}} {{if .Issue}} - - + + {{if .Issue.Content}} - + {{end}} {{else}} - - + + {{if .Repository.Description}} - + {{end}} {{end}} - - + + {{if .Repository.AvatarLink}} + + {{else}} + + {{end}} {{else}} - - - + + + {{end}} - + {{if .IsSigned }} {{ if ne .SignedUser.Theme "gitea" }} - + {{end}} {{else if ne DefaultTheme "gitea"}} - + {{end}} {{template "custom/header" .}} @@ -161,12 +83,14 @@ {{template "custom/body_inner_pre" .}} {{if not .PageIsInstall}} -
+
{{template "base/head_navbar" .}}
{{end}} -{{/* + +{{if false}} + {{/* to make html structure "likely" complete to prevent IDE warnings */}}
-*/}} +{{end}}