From 32a0744e0f433072ff52550676d54a7f7cfeca1b Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <ynerant@crans.org>
Date: Tue, 18 Jan 2022 22:10:21 +0100
Subject: [PATCH] [constellation] Replace master by main
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
---
group_vars/constellation_front.yml | 4 ++--
roles/constellation/tasks/main.yml | 12 ++++++------
.../templates/constellation/settings_local.py.j2 | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/group_vars/constellation_front.yml b/group_vars/constellation_front.yml
index 33d75142..f0be3b70 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 cacace83..e09352d2 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 c9cf83be..913a2541 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/"
--
GitLab