From cc3fb051b00cc1161f2258fcc261c723ebbf1771 Mon Sep 17 00:00:00 2001
From: David Prevot <dprevot+git@evolix.fr>
Date: Mon, 13 Mar 2023 16:34:59 +0100
Subject: [PATCH] Use our new repository for PHP

---
 lxc-php/tasks/php80.yml |  6 +++---
 lxc-php/tasks/php81.yml |  6 +++---
 php/tasks/sury_pre.yml  | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lxc-php/tasks/php80.yml b/lxc-php/tasks/php80.yml
index b0ff90fe..4e5ac498 100644
--- a/lxc-php/tasks/php80.yml
+++ b/lxc-php/tasks/php80.yml
@@ -20,12 +20,12 @@
     mode: "0644"
   loop:
     - "deb [signed-by={{ apt_keyring_dir }}/sury.gpg] https://packages.sury.org/php/ bullseye main"
-    - "deb [signed-by={{ apt_keyring_dir }}/reg.asc] http://pub.evolix.net/ bullseye-php80/"
+    - "deb [signed-by={{ apt_keyring_dir }}/pub_evolix.asc] http://pub.evolix.org/evolix bullseye-php80 main"
 
 - name: copy pub.evolix.net GPG key
   copy:
-    src: reg.asc
-    dest: /var/lib/lxc/{{ lxc_php_version }}/rootfs{{ apt_keyring_dir }}/reg.asc
+    src: pub_evolix.asc
+    dest: /var/lib/lxc/{{ lxc_php_version }}/rootfs{{ apt_keyring_dir }}/pub_evolix.asc
     mode: "0644"
     owner: root
     group: root
diff --git a/lxc-php/tasks/php81.yml b/lxc-php/tasks/php81.yml
index 91dc38e1..677fe14d 100644
--- a/lxc-php/tasks/php81.yml
+++ b/lxc-php/tasks/php81.yml
@@ -20,12 +20,12 @@
     mode: "0644"
   loop:
     - "deb [signed-by={{ apt_keyring_dir }}/sury.gpg] https://packages.sury.org/php/ bullseye main"
-    - "deb [signed-by={{ apt_keyring_dir }}/reg.asc] http://pub.evolix.net/ bullseye-php81/"
+    - "deb [signed-by={{ apt_keyring_dir }}/pub_evolix.asc] http://pub.evolix.org/evolix bullseye-php81 main"
 
 - name: copy pub.evolix.net GPG key
   copy:
-    src: reg.asc
-    dest: /var/lib/lxc/{{ lxc_php_version }}/rootfs{{ apt_keyring_dir }}/reg.asc
+    src: pub_evolix.asc
+    dest: /var/lib/lxc/{{ lxc_php_version }}/rootfs{{ apt_keyring_dir }}/pub_evolix.asc
     mode: "0644"
     owner: root
     group: root
diff --git a/php/tasks/sury_pre.yml b/php/tasks/sury_pre.yml
index 9b8fc684..0d146555 100644
--- a/php/tasks/sury_pre.yml
+++ b/php/tasks/sury_pre.yml
@@ -8,10 +8,10 @@
     owner: root
     group: root
 
-- name: copy pub.evolix.net GPG key
+- name: copy pub.evolix.org GPG key
   copy:
-    src: reg.asc
-    dest: "{{ apt_keyring_dir }}/reg.asc"
+    src: pub_evolix.asc
+    dest: "{{ apt_keyring_dir }}/pub_evolix.asc"
     mode: "0644"
     owner: root
     group: root
@@ -28,9 +28,9 @@
   when:
     - ansible_distribution_release != "bullseye"
 
-- name: Setup pub.evolix.net repository - Add source list
+- name: Setup pub.evolix.org repository - Add source list
   apt_repository:
-    repo: "deb [signed-by={{ apt_keyring_dir }}/reg.asc] http://pub.evolix.net/ {{ ansible_distribution_release }}-php81/"
+    repo: "deb [signed-by={{ apt_keyring_dir }}/pub_evolix.asc] http://pub.evolix.org/evolix {{ ansible_distribution_release }}-php81 main"
     filename: evolix-php
     state: present
   when: