From 8d2af9e54ae95e7acf7b67420d3282657804f3f2 Mon Sep 17 00:00:00 2001 From: Aidan Fitzgerald Date: Wed, 13 Mar 2019 14:02:59 -0400 Subject: [PATCH] Use iiab_hostname and iiab_domain in app.ini Delete gitea_full_url as unused Signed-off-by: Aidan Fitzgerald --- roles/gitea/defaults/main.yml | 2 -- roles/gitea/tasks/install.yml | 2 -- roles/gitea/templates/app.ini.j2 | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/roles/gitea/defaults/main.yml b/roles/gitea/defaults/main.yml index b48f3c631..dd289efe9 100644 --- a/roles/gitea/defaults/main.yml +++ b/roles/gitea/defaults/main.yml @@ -42,8 +42,6 @@ gitea_home: "/home/{{ gitea_user }}" # SSH credentials stored here gitea_run_directory: "{{ gitea_root_directory }}" gitea_url: /gitea -gitea_full_url: "http://{{ iiab_hostname }}.{{ iiab_domain }}{{ gitea_url }}" - gitea_port: 61734 # leet for GITEA # Data locations diff --git a/roles/gitea/tasks/install.yml b/roles/gitea/tasks/install.yml index 71514da6c..ac61ce342 100644 --- a/roles/gitea/tasks/install.yml +++ b/roles/gitea/tasks/install.yml @@ -184,7 +184,5 @@ value: "{{ gitea_run_directory }}" - option: gitea_url value: "{{ gitea_url }}" - - option: gitea_full_url - value: "{{ gitea_full_url }}" - option: gitea_enabled value: "{{ gitea_enabled }}" diff --git a/roles/gitea/templates/app.ini.j2 b/roles/gitea/templates/app.ini.j2 index 6a34630c5..00d503fdb 100644 --- a/roles/gitea/templates/app.ini.j2 +++ b/roles/gitea/templates/app.ini.j2 @@ -118,7 +118,7 @@ FILE_EXTENSIONS = .md,.markdown,.mdown,.mkd [server] ; The protocol the server listens on. One of 'http', 'https', 'unix' or 'fcgi'. PROTOCOL = http -DOMAIN = box +DOMAIN = {{ iiab_hostname }}.{{ iiab_domain }} ROOT_URL = %(PROTOCOL)s://%(DOMAIN)s{{ gitea_url }}/ ; The address to listen on. Either a IPv4/IPv6 address or the path to a unix socket. HTTP_ADDR = 0.0.0.0