From b3b880d6f0e0c29b6ae9364c88de45cbcf689426 Mon Sep 17 00:00:00 2001 From: Admin paquerette Date: Thu, 30 Jun 2022 15:52:37 +0200 Subject: [PATCH 1/2] Utilisation du .env --- roles/adm_instance/templates/config.env.dev.inc.j2 | 5 ----- roles/adm_instance/templates/config.env.inc.j2 | 5 ----- 2 files changed, 10 deletions(-) diff --git a/roles/adm_instance/templates/config.env.dev.inc.j2 b/roles/adm_instance/templates/config.env.dev.inc.j2 index d4735dc1..2a4672ff 100644 --- a/roles/adm_instance/templates/config.env.dev.inc.j2 +++ b/roles/adm_instance/templates/config.env.dev.inc.j2 @@ -7,11 +7,6 @@ include_once $_SERVER['DOCUMENT_ROOT'] . '/vendor/autoload.php'; $site_url = 'https://{{ app_domain }}'; -# Mercanet -$merchant_id = '{{ mercanet_merchant_id }}'; -$secret_key = '{{ mercanet_key }}'; -$mercanet_url = '{{ mercanet_url }}'; - function setSendingParams($mail) { $mail->isSMTP(); $mail->Host = 'localhost'; diff --git a/roles/adm_instance/templates/config.env.inc.j2 b/roles/adm_instance/templates/config.env.inc.j2 index 365f0424..9bcd8a5c 100644 --- a/roles/adm_instance/templates/config.env.inc.j2 +++ b/roles/adm_instance/templates/config.env.inc.j2 @@ -8,11 +8,6 @@ include_once $_SERVER['DOCUMENT_ROOT'] . '/vendor/autoload.php'; $site_url = 'https://{{ app_domain }}'; -# Mercanet -$merchant_id = {{ mercanet_merchant_id }}; -$secret_key = {{ mercanet_key }}; -$mercanet_url = {{ mercanet_url }}; - function setSendingParams($mail) { $mail->Mailer = '{{ mail_protocol | default() }}'; $mail->SMTPSecure = {{ mail_secure | default() }}; -- GitLab From 23d3f857c087aec3a64331a36972025ff24fed3c Mon Sep 17 00:00:00 2001 From: Admin paquerette Date: Fri, 1 Jul 2022 11:37:46 +0200 Subject: [PATCH 2/2] Add php_version --- roles/nextcloud_instance/tasks/upgrade.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/nextcloud_instance/tasks/upgrade.yml b/roles/nextcloud_instance/tasks/upgrade.yml index 00badb91..02131a3d 100644 --- a/roles/nextcloud_instance/tasks/upgrade.yml +++ b/roles/nextcloud_instance/tasks/upgrade.yml @@ -44,7 +44,7 @@ name: _app_backup_instance - name: "backup app list" - shell: "php {{ www_root }}/{{ app_instance_id}}/occ app:list > {{ backup_version_dir }}/{{ app_instance_id }}/{{ app_old_version }}/app.list" + shell: "php{{ php_version }} {{ www_root }}/{{ app_instance_id}}/occ app:list > {{ backup_version_dir }}/{{ app_instance_id }}/{{ app_old_version }}/app.list" become_user: "www-data" vars: ansible_ssh_pipelining: true @@ -117,7 +117,7 @@ service: name={{ rev_proxy }} state=reloaded - name: "perform nextcloud upgrade" - command: "php {{ www_root }}/{{ app_instance_id }}/occ upgrade" + command: "php{{ php_version}} {{ www_root }}/{{ app_instance_id }}/occ upgrade" become_user: "www-data" vars: ansible_ssh_pipelining: true -- GitLab