Projet

Général

Profil

0001-run-bijoe-in-python3-40672.patch

Nicolas Roche, 13 mars 2020 17:37

Télécharger (3,51 ko)

Voir les différences: 

Subject: [PATCH] run bijoe in python3 (#40672)


 delete-tenants.yml                                | 4 ++++
 roles/bijoe/tasks/main.yml                        | 2 +-
 roles/bijoe/vars/main.yml                         | 4 ++--
 roles/hobo-agent/templates/hobo-agent-settings.j2 | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)
delete-tenants.yml
34 34 

  		




  35
  35
  
    
    - name: "delete chrono tenant"

  		




  36
  36
  
    
      command: "{{venv_py3_bin}}/{{apps['chrono']['project_name']}}-manage delete_tenant {{tenants_conf['dev-chrono']}}"

  		




  37
  37
  
    
      ignore_errors: yes

  		




  38
  38
  
    

  		




  39
  39
  
    
    - name: "delete passerelle tenant"

  		




  40
  40
  
    
      command: "{{venv_py3_bin}}/{{apps['passerelle']['project_name']}}-manage delete_tenant {{tenants_conf['dev-passerelle']}}"

  		




  41
  41
  
    
      ignore_errors: yes

  		




  
  42
  
    

  		




  
  43
  
    
    - name: "delete bijoe tenant"

  		




  
  44
  
    
      command: "{{venv_py3_bin}}/{{apps['bijoe']['project_name']}}-manage delete_tenant {{tenants_conf['dev-bijoe']}}"

  		




  
  45
  
    
      ignore_errors: yes

  		












  

    
      roles/bijoe/tasks/main.yml
    
  





  17
  17
  
    

  		




  18
  18
  
    
- name: bijoe nginx setup

  		




  19
  19
  
    
  import_role:

  		




  20
  20
  
    
    name: nginx-setup

  		




  21
  21
  
    

  		




  22
  22
  
    
- name: import-wcs-data script

  		




  23
  23
  
    
  copy:

  		




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

  		




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

  		




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

  		




  26
  26
  
    
    mode: u+x

  		












  

    
      roles/bijoe/vars/main.yml
    
  





  1
  1
  
    
app_name: bijoe

  		




  2
  2
  
    
compile_scss: false

  		




  3
  3
  
    
compile_translations: true

  		




  4
  4
  
    
db_name: "{{apps['bijoe']['db_name']}}"

  		




  5
  
  
    
manage_cmd: "{{venv_python}} {{src_dir}}/bijoe/manage.py"

  		




  
  5
  
    
manage_cmd: "{{venv_py3_python}} {{src_dir}}/bijoe/manage.py"

  		




  6
  6
  
    
nginx_host_pattern: "{{apps['bijoe']['nginx_host_pattern']}}"

  		




  7
  7
  
    
nginx_template_name: "std-nginx-server.j2"

  		




  8
  8
  
    
project_name: "{{apps['bijoe']['project_name']}}"

  		




  9
  9
  
    
server_port: "{{apps['bijoe']['server_port']}}"

  		




  10
  10
  
    
settings_env_var: BIJOE_SETTINGS_FILE

  		




  11
  
  
    
virtualenv: "{{venv}}"

  		




  
  11
  
    
virtualenv: "{{venv_py3}}"

  		












  

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





  8
  8
  
    
{% endfor %}

  		




  9
  9
  
    
}

  		




  10
  10
  
    

  		




  11
  11
  
    
{% for appkey, app in apps.items() %}

  		




  12
  12
  
    
  {% if appkey == 'wcs' %}

  		




  13
  13
  
    
WCS_MANAGE_COMMAND = "{{venv_py3_bin}}/wcsctl.py -f {{publik_settings}}/wcs/wcs.cfg"

  		




  14
  14
  
    
WCS_MANAGE_TRY_COMMAND = "{{venv_py3_bin}}/wcsctl.py"

  		




  15
  15
  
    
  {% else %}

  		




  16
  
  
    
    {% if appkey in ('combo', 'chrono', 'fargo', 'passerelle') %}

  		




  
  16
  
    
    {% if appkey in ('bijoe', 'combo', 'chrono', 'fargo', 'passerelle') %}

  		




  17
  17
  
    
    {# applications en python3 #}

  		




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

  		




  19
  19
  
    
    {% else %}

  		




  20
  20
  
    
    {# cas général, applications Django toutjours en python2, devra disparaître #}

  		




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

  		




  22
  22
  
    
    {% endif %}

  		




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

  		




  24
  24
  
    
   {% endif %}

  		




  25
  
  
    
-