diff --git a/host_vars/gitzly.adm.crans.org.yml b/host_vars/gitzly.adm.crans.org.yml index 731dc921..ef63b728 100644 --- a/host_vars/gitzly.adm.crans.org.yml +++ b/host_vars/gitzly.adm.crans.org.yml @@ -33,6 +33,8 @@ loc_nginx: loc_reverseproxy: reverseproxy_sites: - {from: gitlab.crans.org, to: "127.0.0.1:8000"} - - {from: gitlab.adm.crans.org, to: "127.0.0.1:8000", ssl: adm.crans.corg} + - {from: gitlab.adm.crans.org, to: "127.0.0.1:8000", ssl: adm.crans.org} + + redirect_sites: [] static_sites: [] diff --git a/hosts b/hosts index e66ffb17..d141b7e4 100644 --- a/hosts +++ b/hosts @@ -125,6 +125,9 @@ radius hodaur.adm.crans.org sputnik.adm.crans.org +[reverseproxy:children] +git + [roundcube] roundcube.adm.crans.org diff --git a/plays/gitlab.yml b/plays/gitlab.yml index ff4cd57f..66806b7c 100755 --- a/plays/gitlab.yml +++ b/plays/gitlab.yml @@ -11,6 +11,8 @@ vars: certbot: '{{ loc_certbot | default(glob_certbot | default([])) }}' gitlab: '{{ glob_gitlab | default({}) | combine(loc_gitlab | default({}), recursive=True) }}' + nginx: '{{ glob_nginx | default({}) | combine(loc_nginx | default({})) }}' + reverseproxy: '{{ glob_reverseproxy | default({}) | combine(loc_reverseproxy | default({})) }}' roles: - certbot - gitlab