Projet

Général

Profil

0001-run-authentic2-in-python3-40403.patch

Paul Marillonnet, 04 mars 2020 14:45

Télécharger (2,47 ko)

Voir les différences: 

Subject: [PATCH] run authentic2 in python3 (#40403)


 delete-tenants.yml                                | 2 +-
 roles/authentic/vars/main.yml                     | 4 ++--
 roles/hobo-agent/templates/hobo-agent-settings.j2 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
delete-tenants.yml
21 21 
      ignore_errors: yes
22 22 

  		




  23
  23
  
    
    - name: "delete authentic tenant"

  		




  24
  
  
    
      command: "{{venv_bin}}/{{apps['authentic']['project_name']}}-manage delete_tenant {{tenants_conf['connexion-authentic']}}"

  		




  
  24
  
    
      command: "{{venv_py3_bin}}/{{apps['authentic']['project_name']}}-manage delete_tenant {{tenants_conf['connexion-authentic']}}"

  		




  25
  25
  
    
      ignore_errors: yes

  		




  26
  26
  
    

  		




  27
  27
  
    
    - name: "delete wcs tenant"

  		












  

    
      roles/authentic/vars/main.yml
    
  





  2
  2
  
    
compile_scss: false

  		




  3
  3
  
    
compile_translations: true

  		




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

  		




  5
  
  
    
manage_cmd: "{{venv_python}} {{src_dir}}/authentic/authentic2-ctl"

  		




  
  5
  
    
manage_cmd: "{{venv_py3_python}} {{src_dir}}/authentic/authentic2-ctl"

  		




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

  		




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

  		




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

  		




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

  		




  10
  10
  
    
settings_env_var: AUTHENTIC2_SETTINGS_FILE

  		




  11
  
  
    
virtualenv: "{{venv}}"

  		




  
  11
  
    
virtualenv: "{{venv_py3}}"

  		












  

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





  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 ('combo', 'chrono', 'fargo', 'passerelle', 'authentic') %}

  		




  17
  17
  
    
    {# applications en python3 #}

  		




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

  		




  19
  19
  
    
    {% else %}

  		




  20
  
  
    
-