Projet

Général

Profil

0001-run-welco-in-python3-40797.patch

Nicolas Roche, 17 mars 2020 18:05

Télécharger (2,26 ko)

Voir les différences: 

Subject: [PATCH] run welco in python3 (#40797)


 roles/hobo-agent/templates/hobo-agent-settings.j2 | 2 +-
 roles/welco/vars/main.yml                         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
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 ('bijoe', 'combo', 'chrono', 'fargo', 'passerelle') %}

  		




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

  		




  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 %}

  		












  

    
      roles/welco/vars/main.yml
    
  





  1
  1
  
    
app_name: welco

  		




  2
  2
  
    
compile_scss: false

  		




  3
  3
  
    
compile_translations: true

  		




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

  		




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

  		




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

  		




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

  		




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

  		




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

  		




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

  		




  10
  10
  
    
settings_env_var: WELCO_SETTINGS_FILE

  		




  11
  
  
    
virtualenv: "{{venv}}"

  		




  
  11
  
    
virtualenv: "{{venv_py3}}"

  		




  12
  
  
    
-