From 99dae4de830bb11b2be7ed5c15462baab5ae6a2e Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 9 Dec 2018 00:40:06 +0100 Subject: [PATCH] use filter to split out hostename and schema from listening address --- defaults/main.yml | 3 +-- templates/custom/conf/app.ini.j2 | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 8a2457c..a1cd18d 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -24,8 +24,7 @@ gitea_data_dir: "{{ gitea_base_dir }}/data" gitea_bind_ip: 127.0.0.1 gitea_bind_port: 61000 -gitea_listen_address: gitea.example.com -gitea_listen_protocol: "{{ gitea_bind_protocol }}" +gitea_listen_address: http://gitea.example.com gitea_install_lock: true gitea_secret: "1234567ABCDEFG" diff --git a/templates/custom/conf/app.ini.j2 b/templates/custom/conf/app.ini.j2 index d05d72f..84c3447 100644 --- a/templates/custom/conf/app.ini.j2 +++ b/templates/custom/conf/app.ini.j2 @@ -66,8 +66,8 @@ FILE_EXTENSIONS = .md,.markdown,.mdown,.mkd [server] PROTOCOL = {{ 'https' if gitea_tls_enabled else 'http' }} -DOMAIN = {{ gitea_listen_address }} -ROOT_URL = {{ gitea_listen_protocol }}://%(DOMAIN)s/ +DOMAIN = {{ gitea_listen_address | urlsplit('hostname') }} +ROOT_URL = {{ gitea_listen_address | urlsplit('scheme') }}://%(DOMAIN)s/ HTTP_ADDR = {{ gitea_bind_ip }} HTTP_PORT = {{ gitea_bind_port }} UNIX_SOCKET_PERMISSION = 666