Merge branch 'mercanet-v2' into 'master'

Utilisation du .env et nettoyage

See merge request !17

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';

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() }};

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