Projet

Général

Profil

0001-switch-to-dev.publik.love-domain-27824.patch

Emmanuel Cazenave, 15 novembre 2018 12:11

Télécharger (9,52 ko)

Voir les différences: 

Subject: [PATCH] switch to dev.publik.love domain (#27824)

Download the certifcate chain and adapt nginx configuration.
publik.love certificates beeing handled by letsencrypt,
we can also get rid of the hacks around request.

 group_vars/all                                | 60 +++++++++----------
 install.yml                                   |  1 +
 .../app-setup/templates/app-settings-base.j2  |  2 -
 roles/base/tasks/main.yml                     | 21 +++++++
 roles/bijoe/tasks/main.yml                    |  6 --
 .../bijoe/templates/bijoe-import-wcs-data.j2  |  4 --
 .../templates/hobo-agent-settings.j2          |  2 +-
 tenants-inventory.yml.example                 | 20 +++----
 8 files changed, 63 insertions(+), 53 deletions(-)
 delete mode 100644 roles/bijoe/templates/bijoe-import-wcs-data.j2
group_vars/all
3 3 
git_ssh: false
4 4 
clone_repo: true
5 5 
src_dir: "/home/{{user}}/src"
6 
ssl_certificate: "/etc/ssl/certs/*.local.publik.crt"
7 
ssl_certificate_key: "/etc/ssl/private/*.local.publik.key"
6 
ssl_certificate: "{{venv_certs}}/dev.publik.love-fullchain.pem"
7 
ssl_certificate_key: "{{venv_certs}}/dev.publik.love-privkey.pem"
8 8 
venv: "/home/{{user}}/envs/publik-env"
9 9 
user: publik
10 10 
apps:
11 11 
  authentic:
12 12 
    db_name: authentic_multitenant
13 
    host_pattern: "*-authentic.local.publik"
14 
    nginx_host_pattern: '~^(.*)\-authentic\.local\.publik$'
13 
    host_pattern: "*authentic.dev.publik.love"
14 
    nginx_host_pattern: '~^(.*)authentic\.dev\.publik\.love$'
15 15 
    project_name: authentic-multitenant
16 16 
    server_port: 8000
17 17 
  combo:
18 18 
    db_name: combo
19 
    host_pattern: "*-combo.local.publik"
20 
    nginx_host_pattern: '~^(.*)\-combo\.local\.publik$'
19 
    host_pattern: "*combo.dev.publik.love"
20 
    nginx_host_pattern: '~^(.*)combo\.dev\.publik\.love$'
21 21 
    project_name: combo
22 22 
    server_port: 8004
23 23 
  hobo:
24 24 
    db_name: hobo
25 
    host_pattern: "*-hobo.local.publik"
26 
    nginx_host_pattern: '~^(.*)\-hobo\.local\.publik$'
25 
    host_pattern: "*hobo.dev.publik.love"
26 
    nginx_host_pattern: '~^(.*)hobo\.dev\.publik\.love$'
27 27 
    project_name: hobo
28 28 
    server_port: 8016
29 29 
  passerelle:
30 30 
    db_name: passerelle
31 
    host_pattern: "*-passerelle.local.publik"
32 
    nginx_host_pattern: '~^(.*)\-passerelle\.local\.publik$'
31 
    host_pattern: "*passerelle.dev.publik.love"
32 
    nginx_host_pattern: '~^(.*)passerelle\.dev\.publik\.love$'
33 33 
    project_name: passerelle
34 34 
    server_port: 8024
35 35 
  fargo:
36 36 
    db_name: fargo
37 
    host_pattern: "*-fargo.local.publik"
38 
    nginx_host_pattern: '~^(.*)\-fargo\.local\.publik$'
37 
    host_pattern: "*fargo.dev.publik.love"
38 
    nginx_host_pattern: '~^(.*)fargo\.dev\.publik\.love$'
39 39 
    project_name: fargo
40 40 
    server_port: 8036
41 41 
  chrono:
42 42 
    db_name: chrono
43 
    host_pattern: "*-chrono.local.publik"
44 
    nginx_host_pattern: '~^(.*)\-chrono\.local\.publik$'
43 
    host_pattern: "*chrono.dev.publik.love"
44 
    nginx_host_pattern: '~^(.*)chrono\.dev\.publik\.love$'
45 45 
    project_name: chrono
46 46 
    server_port: 8040
47 47 
  bijoe:
48 48 
    db_name: bijoe
49 
    host_pattern: "*-bijoe.local.publik"
50 
    nginx_host_pattern: '~^(.*)\-bijoe\.local\.publik$'
49 
    host_pattern: "*bijoe.dev.publik.love"
50 
    nginx_host_pattern: '~^(.*)bijoe\.dev\.publik\.love$'
51 51 
    project_name: bijoe
52 52 
    server_port: 8048
53 53 
  wcs:
54 54 
    db_name: wcs
55 
    host_pattern: "*-wcs.local.publik"
56 
    nginx_host_pattern: '~^(.*)\-wcs\.local\.publik$'
55 
    host_pattern: "*wcs.dev.publik.love"
56 
    nginx_host_pattern: '~^(.*)wcs\.dev\.publik\.love$'
57 57 
    project_name: wcs
58 58 
    server_port: 8032
59 59 
  welco:
60 60 
    db_name: welco
61 
    host_pattern: "*-welco.local.publik"
62 
    nginx_host_pattern: '~^(.*)\-welco\.local\.publik$'
61 
    host_pattern: "*welco.dev.publik.love"
62 
    nginx_host_pattern: '~^(.*)welco\.dev\.publik\.love$'
63 63 
    project_name: welco
64 64 
    server_port: 8052
65 65 
tenants_conf:
66 
  connexion-authentic: "connexion-authentic.local.publik"
67 
  agent-combo: "agent-combo.local.publik"
68 
  user-combo: "user-combo.local.publik"
69 
  dev-hobo: "dev-hobo.local.publik"
70 
  demarches-wcs: "demarches-wcs.local.publik"
71 
  dev-passerelle: "dev-passerelle.local.publik"
72 
  dev-fargo: "dev-fargo.local.publik"
73 
  dev-chrono: "dev-chrono.local.publik"
74 
  dev-bijoe: "dev-bijoe.local.publik"
75 
  dev-welco: # disabled by default -- could be "dev-welco.local.publik"
66 
  connexion-authentic: "authentic.dev.publik.love"
67 
  agent-combo: "agent-combo.dev.publik.love"
68 
  user-combo: "combo.dev.publik.love"
69 
  dev-hobo: "hobo.dev.publik.love"
70 
  demarches-wcs: "wcs.dev.publik.love"
71 
  dev-passerelle: "passerelle.dev.publik.love"
72 
  dev-fargo: "fargo.dev.publik.love"
73 
  dev-chrono: "chrono.dev.publik.love"
74 
  dev-bijoe: "bijoe.dev.publik.love"
75 
  dev-welco: # disabled by default -- could be "welco.dev.publik.love"
install.yml
17 17 
  vars:
18 18 
    themes_dir: "{{venv}}/themes"
19 19 
    venv_bin: "{{venv}}/bin"
20 
    venv_certs: "{{venv}}/certs"
20 21 
    venv_conf: "{{venv}}/conf"
21 22 
    venv_pip: "{{venv_bin}}/pip"
22 23 
    venv_python: "{{venv_bin}}/python"
roles/app-setup/templates/app-settings-base.j2
10 10 

  		




  11
  11
  
    
THEMES_DIRECTORY = '{{themes_dir}}'

  		




  12
  12
  
    

  		




  13
  
  
    
os.environ['REQUESTS_CA_BUNDLE'] = '/etc/ssl/certs/ca-certificates.crt'

  		




  14
  
  
    

  		




  15
  13
  
    
ALLOWED_HOSTS = ['*']

  		




  16
  14
  
    

  		




  17
  15
  
    
LOGGING = {

  		












  

    
      roles/base/tasks/main.yml
    
  





  98
  98
  
    
    src: "{{ src_dir }}/publik-base-theme"

  		




  99
  99
  
    
    path: "{{themes_dir}}/publik-base"

  		




  100
  100
  
    
    state: link

  		




  
  101
  
    

  		




  
  102
  
    
- name: create cert directory

  		




  
  103
  
    
  file:

  		




  
  104
  
    
    path: "{{venv_certs}}"

  		




  
  105
  
    
    state: directory

  		




  
  106
  
    
  tags:

  		




  
  107
  
    
    - tls

  		




  
  108
  
    

  		




  
  109
  
    
- name: Download fullchain.pem

  		




  
  110
  
    
  get_url:

  		




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

  		




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

  		




  
  113
  
    
  tags:

  		




  
  114
  
    
    - tls

  		




  
  115
  
    

  		




  
  116
  
    
- name: Download privkey.pem

  		




  
  117
  
    
  get_url:

  		




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

  		




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

  		




  
  120
  
    
  tags:

  		




  
  121
  
    
    - tls

  		












  

    
      roles/bijoe/tasks/main.yml
    
  





  24
  24
  
    
    src: "{{ src_dir }}/bijoe/debian/import-wcs-data.sh"

  		




  25
  25
  
    
    dest:  "{{ venv_bin }}/import-wcs-data.sh"

  		




  26
  26
  
    
    mode: u+x

  		




  27
  
  
    

  		




  28
  
  
    
- name: import-wcs-data wrapper script

  		




  29
  
  
    
  template:

  		




  30
  
  
    
    src: "bijoe-import-wcs-data.j2"

  		




  31
  
  
    
    dest:  "{{ venv_bin }}/bijoe-import-wcs-data.sh"

  		




  32
  
  
    
    mode: u+x

  		












  

    
      roles/bijoe/templates/bijoe-import-wcs-data.j2
    
  





  1
  
  
    
#!/bin/sh

  		




  2
  
  
    

  		




  3
  
  
    
export REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt

  		




  4
  
  
    
{{ venv_bin}}/import-wcs-data.sh

  		












  

    
      roles/hobo-agent/templates/hobo-agent-settings.j2
    
  





  12
  12
  
    
{% filter upper %}{{appkey}}{% endfilter %}_MANAGE_COMMAND = "{{venv_bin}}/{{app['project_name']}}-manage"

  		




  13
  13
  
    
{% filter upper %}{{appkey}}{% endfilter %}_MANAGE_TRY_COMMAND = {% filter upper %}{{appkey}}{% endfilter %}_MANAGE_COMMAND

  		




  14
  14
  
    
{% else %}

  		




  15
  
  
    
WCS_MANAGE_COMMAND = "REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt {{venv_bin}}/wcsctl.py -f {{venv_conf}}/wcs.cfg"

  		




  
  15
  
    
WCS_MANAGE_COMMAND = "{{venv_bin}}/wcsctl.py -f {{venv_conf}}/wcs.cfg"

  		




  16
  16
  
    
WCS_MANAGE_TRY_COMMAND = "{{venv_bin}}/wcsctl.py"

  		




  17
  17
  
    
{% endif %}

  		




  18
  18
  
    
{% endfor %}

  		












  

    
      tenants-inventory.yml.example
    
  





  4
  4
  
    
    localhost:

  		




  5
  5
  
    
      ansible_connection: local

  		




  6
  6
  
    
      tenants_conf:

  		




  7
  
  
    
        connexion-authentic: "customname-authentic.local.publik"

  		




  8
  
  
    
        agent-combo: "customname-combo.local.publik"

  		




  9
  
  
    
        user-combo: "customname-combo.local.publik"

  		




  10
  
  
    
        dev-hobo: "customname-hobo.local.publik"

  		




  11
  
  
    
        demarches-wcs: "customname-wcs.local.publik"

  		




  12
  
  
    
        dev-passerelle: "customname-passerelle.local.publik"

  		




  13
  
  
    
        dev-fargo: "customname-fargo.local.publik"

  		




  14
  
  
    
        dev-chrono: "customname-chrono.local.publik"

  		




  15
  
  
    
        dev-bijoe: "customname-bijoe.local.publik"

  		




  16
  
  
    
        dev-welco: "customname-welco.local.publik"

  		




  
  7
  
    
        connexion-authentic: "customname-authentic.dev.publik.love"

  		




  
  8
  
    
        agent-combo: "customname-agent-combo.dev.publik.love"

  		




  
  9
  
    
        user-combo: "customname-combo.dev.publik.love"

  		




  
  10
  
    
        dev-hobo: "customname-hobo.dev.publik.love"

  		




  
  11
  
    
        demarches-wcs: "customname-wcs.dev.publik.love"

  		




  
  12
  
    
        dev-passerelle: "customname-passerelle.dev.publik.love"

  		




  
  13
  
    
        dev-fargo: "customname-fargo.dev.publik.love"

  		




  
  14
  
    
        dev-chrono: "customname-chrono.dev.publik.love"

  		




  
  15
  
    
        dev-bijoe: "customname-bijoe.dev.publik.love"

  		




  
  16
  
    
        dev-welco: "customname-welco.dev.publik.love"

  		




  17
  17
  
    

  		




  18
  
  
    
-