diff --git a/group_vars/constellation_front.yml b/group_vars/constellation_front.yml index 33d75142341affdd3b7050f3d8f80d377ee466bc..f0be3b70a81dad4e188bc021ae1fb566624cbcfd 100644 --- a/group_vars/constellation_front.yml +++ b/group_vars/constellation_front.yml @@ -11,11 +11,11 @@ loc_nginx: locations: - filter: "/static" params: - - "alias {% if constellation.version == 'master' %}/var/lib/constellation/static/{% else %}/var/local/constellation/static/{% endif %}" + - "alias {% if constellation.version == 'main' %}/var/lib/constellation/static/{% else %}/var/local/constellation/static/{% endif %}" - filter: "/media" params: - - "alias {% if constellation.version == 'master' %}/var/lib/constellation/media/{% else %}/var/local/constellation/media/{% endif %}" + - "alias {% if constellation.version == 'main' %}/var/lib/constellation/media/{% else %}/var/local/constellation/media/{% endif %}" - filter: "/doc" params: diff --git a/roles/constellation/tasks/main.yml b/roles/constellation/tasks/main.yml index cacace83c9b68a131d4ea05e1178808fd21d13a5..e09352d22d574641c68bc6a524fd32a5877eba61 100644 --- a/roles/constellation/tasks/main.yml +++ b/roles/constellation/tasks/main.yml @@ -26,13 +26,13 @@ - git+https://gitlab.adm.crans.org/nounous/django-dnsmanager.git - name: Set configuration directories in development mode - when: constellation.version != "master" + when: constellation.version != "main" set_fact: module_path: "/var/local/constellation/constellation" project_path: "/var/local/constellation" - name: Set configuration directories in production mode - when: constellation.version == "master" + when: constellation.version == "main" set_fact: module_path: "/usr/local/lib/python3.9/dist-packages/constellation" project_path: "/usr/local/lib/python3.9/dist-packages/constellation" @@ -56,7 +56,7 @@ ignore_errors: "{{ ansible_check_mode }}" - name: Clone constellation repository (development) - when: constellation.version != "master" + when: constellation.version != "main" git: repo: 'https://gitlab.adm.crans.org/nounous/constellation.git' dest: "{{ project_path }}" @@ -65,7 +65,7 @@ recursive: true - name: Install pip module with editable flag (development) - when: constellation.version != "master" + when: constellation.version != "main" pip: name: - "{{ project_path }}" @@ -73,14 +73,14 @@ state: latest - name: Install and upgrade constellation (production) - when: constellation.version == "master" + when: constellation.version == "main" pip: name: - git+https://gitlab.adm.crans.org/nounous/constellation.git state: latest - name: Set owner of cloned project - when: constellation.version != "master" + when: constellation.version != "main" file: path: "{{ project_path }}" owner: "{{ constellation.owner }}" diff --git a/roles/constellation/templates/constellation/settings_local.py.j2 b/roles/constellation/templates/constellation/settings_local.py.j2 index c9cf83be9023ada6644c44743c6dfa648c99d48f..913a25417b17e33291af769355718526fa3ea603 100644 --- a/roles/constellation/templates/constellation/settings_local.py.j2 +++ b/roles/constellation/templates/constellation/settings_local.py.j2 @@ -38,7 +38,7 @@ DATABASES = { }, } -{% if constellation.version == "master" %} +{% if constellation.version == "main" %} {% if constellation.front %} STATIC_ROOT = "/var/lib/constellation/static/"