crans
/
ansible
mirror of http://gitlab.adm.crans.org/nounous/ansible.git
19
0
Fork 0
Code Issues Projects Releases Wiki Activity

[constellation] Replace master by main 

Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
certbot_on_virtu
Yohann D'ANELLO 2022-01-18 22:10:21 +01:00
parent 039d87ee74
commit 32a0744e0f
Signed by: _ynerant
GPG Key ID: 3A75C55819C8CF85
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
group_vars/constellation_front.yml
View File

@ -11,11 +11,11 @@ loc_nginx:
locations: locations:
- filter: "/static" - filter: "/static"
params: 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" - filter: "/media"
params: 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" - filter: "/doc"
params: params:

12
roles/constellation/tasks/main.yml
View File

@ -26,13 +26,13 @@
- git+https://gitlab.adm.crans.org/nounous/django-dnsmanager.git - git+https://gitlab.adm.crans.org/nounous/django-dnsmanager.git
- name: Set configuration directories in development mode - name: Set configuration directories in development mode
when: constellation.version != "master" when: constellation.version != "main"
set_fact: set_fact:
module_path: "/var/local/constellation/constellation" module_path: "/var/local/constellation/constellation"
project_path: "/var/local/constellation" project_path: "/var/local/constellation"
- name: Set configuration directories in production mode - name: Set configuration directories in production mode
when: constellation.version == "master" when: constellation.version == "main"
set_fact: set_fact:
module_path: "/usr/local/lib/python3.9/dist-packages/constellation" module_path: "/usr/local/lib/python3.9/dist-packages/constellation"
project_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 }}" ignore_errors: "{{ ansible_check_mode }}"
- name: Clone constellation repository (development) - name: Clone constellation repository (development)
when: constellation.version != "master" when: constellation.version != "main"
git: git:
repo: 'https://gitlab.adm.crans.org/nounous/constellation.git' repo: 'https://gitlab.adm.crans.org/nounous/constellation.git'
dest: "{{ project_path }}" dest: "{{ project_path }}"
@ -65,7 +65,7 @@
recursive: true recursive: true
- name: Install pip module with editable flag (development) - name: Install pip module with editable flag (development)
when: constellation.version != "master" when: constellation.version != "main"
pip: pip:
name: name:
- "{{ project_path }}" - "{{ project_path }}"
@ -73,14 +73,14 @@
state: latest state: latest
- name: Install and upgrade constellation (production) - name: Install and upgrade constellation (production)
when: constellation.version == "master" when: constellation.version == "main"
pip: pip:
name: name:
- git+https://gitlab.adm.crans.org/nounous/constellation.git - git+https://gitlab.adm.crans.org/nounous/constellation.git
state: latest state: latest
- name: Set owner of cloned project - name: Set owner of cloned project
when: constellation.version != "master" when: constellation.version != "main"
file: file:
path: "{{ project_path }}" path: "{{ project_path }}"
owner: "{{ constellation.owner }}" owner: "{{ constellation.owner }}"

2
roles/constellation/templates/constellation/settings_local.py.j2
View File

@ -38,7 +38,7 @@ DATABASES = {
}, },
} }
{% if constellation.version == "master" %} {% if constellation.version == "main" %}
{% if constellation.front %} {% if constellation.front %}
STATIC_ROOT = "/var/lib/constellation/static/" STATIC_ROOT = "/var/lib/constellation/static/"