From e14b94088dfbbfb6904eaeec58ea9aeaf2d12609 Mon Sep 17 00:00:00 2001 From: Zolfa Date: Sun, 13 Dec 2020 20:33:12 +0100 Subject: [PATCH] roles/gitea: customizable ssh port --- roles/gitea/defaults/main.yaml | 3 ++- roles/gitea/handlers/main.yaml | 5 +++++ roles/gitea/tasks/01-install.yaml | 2 ++ roles/gitea/templates/app.ini.j2 | 4 ++-- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/roles/gitea/defaults/main.yaml b/roles/gitea/defaults/main.yaml index 2c1b375..306f60a 100644 --- a/roles/gitea/defaults/main.yaml +++ b/roles/gitea/defaults/main.yaml @@ -1,8 +1,9 @@ --- host_fqdn: '{{ ansible_hostname }}.dmz.{{ domain }}' -gitea_version: 1.11.6 +gitea_version: 1.12.6 gitea_nginx_fqdn: 'projects.{{ domain }}' gitea_renew_secrets: false +gitea_ssh_port: 22 ldap_server: 'ldap1.dmz.{{ domain }}' ldap_basedn: 'dc={{ domain.replace(".", ",dc=") }}' ldap_tls_enabled: true diff --git a/roles/gitea/handlers/main.yaml b/roles/gitea/handlers/main.yaml index 49313d0..d314f90 100644 --- a/roles/gitea/handlers/main.yaml +++ b/roles/gitea/handlers/main.yaml @@ -1,2 +1,7 @@ - name: 'update trusted ca' shell: '/usr/sbin/update-ca-certificates' + +- name: 'restart gitea' + systemd: + name: 'gitea' + state: 'restarted' diff --git a/roles/gitea/tasks/01-install.yaml b/roles/gitea/tasks/01-install.yaml index b76c411..dcafc08 100644 --- a/roles/gitea/tasks/01-install.yaml +++ b/roles/gitea/tasks/01-install.yaml @@ -56,6 +56,8 @@ mode: '750' owner: 'root' group: 'git' + notify: + - 'restart gitea' - block: - name: 'create gitea DB' diff --git a/roles/gitea/templates/app.ini.j2 b/roles/gitea/templates/app.ini.j2 index 5ed22ff..0b49543 100644 --- a/roles/gitea/templates/app.ini.j2 +++ b/roles/gitea/templates/app.ini.j2 @@ -12,11 +12,11 @@ ROOT_URL = https://%(DOMAIN)s/ HTTP_ADDR = /run/gitea/gitea.sock UNIX_SOCKET_PERMISSION = 660 SSH_DOMAIN = %(DOMAIN)s -SSH_PORT = 22 +SSH_PORT = {{ gitea_ssh_port }} SSH_CREATE_AUTHORIZED_KEYS_FILE = true SSH_BACKUP_AUTHORIZED_KEYS = true APP_DATA_PATH = data -LANDING_PAGE = home +LANDING_PAGE = explore LFS_START_SERVER = true LFS_CONTENT_PATH = /var/lib/gitea/data/lfs LFS_JWT_SECRET = {{ gitea_LFS_JWT_SECRET }}