clean last python2 references (#46530)

This commit is contained in:
Emmanuel Cazenave 2020-10-07 15:30:26 +02:00 committed by Frédéric Péters
parent d6ea4dfae1
commit 92c12bdfa8
4 changed files with 0 additions and 10 deletions

View File

@ -2,7 +2,6 @@
- name: delete all publik tenants
hosts: local
vars:
venv_bin: "{{venv}}/bin"
venv_py3_bin: "{{venv_py3}}/bin"
roles:
- facts

View File

@ -9,7 +9,6 @@ publik_settings: "{{publik_conf}}/settings"
src_dir: "/home/{{user}}/src"
ssl_certificate: "{{certs_dir}}/dev.publik.love-fullchain.pem"
ssl_certificate_key: "{{certs_dir}}/dev.publik.love-privkey.pem"
venv: "/home/{{user}}/envs/publik-env"
venv_py3: "/home/{{user}}/envs/publik-env-py3"
user: your_user_name
postgresql_port: 5432

View File

@ -18,7 +18,5 @@
vars:
certs_dir: "{{devinst_share}}/certs"
themes_dir: "{{devinst_share}}/themes"
venv_bin: "{{venv}}/bin"
venv_py3_bin: "{{venv_py3}}/bin"
venv_python: "{{venv_bin}}/python"
venv_py3_python: "{{venv_py3_bin}}/python"

View File

@ -13,13 +13,7 @@ AGENT_HOST_PATTERNS = {
WCS_MANAGE_COMMAND = "{{venv_py3_bin}}/wcsctl.py -f {{publik_settings}}/wcs/wcs.cfg"
WCS_MANAGE_TRY_COMMAND = "{{venv_py3_bin}}/wcsctl.py"
{% else %}
{% if appkey in ('authentic', 'bijoe', 'combo', 'chrono', 'fargo', 'hobo', 'passerelle', 'welco') %}
{# applications en python3 #}
{% filter upper %}{{appkey}}{% endfilter %}_MANAGE_COMMAND = "{{venv_py3_bin}}/{{app['project_name']}}-manage"
{% else %}
{# cas général, applications Django toutjours en python2, devra disparaître #}
{% filter upper %}{{appkey}}{% endfilter %}_MANAGE_COMMAND = "{{venv_bin}}/{{app['project_name']}}-manage"
{% endif %}
{% filter upper %}{{appkey}}{% endfilter %}_MANAGE_TRY_COMMAND = {% filter upper %}{{appkey}}{% endfilter %}_MANAGE_COMMAND
{% endif %}