Projet

Général

Profil

0001-move-certs-and-themes-directory-to-usr-local-share-4.patch

Emmanuel Cazenave, 07 avril 2020 06:07

Télécharger (2,96 ko)

Voir les différences: 

Subject: [PATCH] move certs and themes directory to ~/usr/local/share (#41271)


 group_vars/all            | 5 +++--
 install.yml               | 4 ++--
 roles/base/tasks/main.yml | 9 ++++++---
 tasks/install_theme.yml   | 2 ++
 4 files changed, 13 insertions(+), 7 deletions(-)
group_vars/all
3 3 
django_version: 1.11.18
4 4 
git_ssh: false
5 5 
clone_repo: true
6 
devinst_share: /usr/local/share/publik-devinst
6 7 
publik_conf: "/home/{{user}}/.config/publik"
7 8 
publik_settings: "{{publik_conf}}/settings"
8 9 
src_dir: "/home/{{user}}/src"
9 
ssl_certificate: "{{venv_certs}}/dev.publik.love-fullchain.pem"
10 
ssl_certificate_key: "{{venv_certs}}/dev.publik.love-privkey.pem"
10 
ssl_certificate: "{{certs_dir}}/dev.publik.love-fullchain.pem"
11 
ssl_certificate_key: "{{certs_dir}}/dev.publik.love-privkey.pem"
11 12 
venv: "/home/{{user}}/envs/publik-env"
12 13 
venv_py3: "/home/{{user}}/envs/publik-env-py3"
13 14 
user: your_user_name
install.yml
16 16 
    - hobo-agent
17 17 
    - end
18 18 
  vars:
19 
    themes_dir: "{{publik_conf}}/themes"
19 
    certs_dir: "{{devinst_share}}/certs"
20 
    themes_dir: "{{devinst_share}}/themes"
20 21 
    venv_bin: "{{venv}}/bin"
21 22 
    venv_py3_bin: "{{venv_py3}}/bin"
22 
    venv_certs: "{{publik_conf}}/certs"
23 23 
    venv_python: "{{venv_bin}}/python"
24 24 
    venv_py3_python: "{{venv_py3_bin}}/python"
roles/base/tasks/main.yml
143 143 

  		




  144
  144
  
    
- name: create cert directory

  		




  145
  145
  
    
  file:

  		




  146
  
  
    
    path: "{{venv_certs}}"

  		




  
  146
  
    
    path: "{{certs_dir}}"

  		




  147
  147
  
    
    state: directory

  		




  
  148
  
    
  become: yes

  		




  148
  149
  
    
  tags:

  		




  149
  150
  
    
    - tls

  		




  150
  151
  
    

  		




  151
  152
  
    
- name: Download fullchain.pem

  		




  152
  153
  
    
  get_url:

  		




  153
  154
  
    
    url: https://doc-publik.entrouvert.com/media/certificates/dev.publik.love/fullchain.pem

  		




  154
  
  
    
    dest: "{{venv_certs}}/dev.publik.love-fullchain.pem"

  		




  
  155
  
    
    dest: "{{certs_dir}}/dev.publik.love-fullchain.pem"

  		




  155
  156
  
    
    force: yes

  		




  
  157
  
    
  become: yes

  		




  156
  158
  
    
  tags:

  		




  157
  159
  
    
    - tls

  		




  158
  160
  
    

  		




  159
  161
  
    
- name: Download privkey.pem

  		




  160
  162
  
    
  get_url:

  		




  161
  163
  
    
    url: https://doc-publik.entrouvert.com/media/certificates/dev.publik.love/privkey.pem

  		




  162
  
  
    
    dest: "{{venv_certs}}/dev.publik.love-privkey.pem"

  		




  
  164
  
    
    dest: "{{certs_dir}}/dev.publik.love-privkey.pem"

  		




  163
  165
  
    
    force: yes

  		




  
  166
  
    
  become: yes

  		




  164
  167
  
    
  tags:

  		




  165
  168
  
    
    - tls

  		












  

    
      tasks/install_theme.yml
    
  





  25
  25
  
    
  file:

  		




  26
  26
  
    
    path: "{{themes_dir}}"

  		




  27
  27
  
    
    state: directory

  		




  
  28
  
    
  become: yes

  		




  28
  29
  
    

  		




  29
  30
  
    
- name: link to {{theme_repo}}

  		




  30
  31
  
    
  file:

  		




  31
  32
  
    
    src: "{{src_theme_dir}}"

  		




  32
  33
  
    
    path: "{{themes_dir}}/{{theme_link}}"

  		




  33
  34
  
    
    state: link

  		




  
  35
  
    
  become: yes

  		




  34
  
  
    
-