From c4fd916dc7078dc47365edb66d8e92a65ce5dad4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?=
 <timothee.jaussoin@belledonne-communications.com>
Date: Tue, 10 Jan 2023 11:34:21 +0100
Subject: [PATCH] Fix #64 Ensure php80 for RPM package

---
 cron/flexiapi.redhat          |  8 ++++----
 flexisip-account-manager.spec | 13 ++-----------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/cron/flexiapi.redhat b/cron/flexiapi.redhat
index 4f73875..87d9785 100644
--- a/cron/flexiapi.redhat
+++ b/cron/flexiapi.redhat
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 cd /opt/belledonne-communications/share/flexisip-account-manager/flexiapi/
-scl enable rh-php73 "php artisan digest:clear-nonces 60"
-scl enable rh-php73 "php artisan accounts:clear-api-keys 60"
-scl enable rh-php73 "php artisan accounts:clear-accounts-tombstones 7 --apply"
-scl enable rh-php73 "php artisan accounts:clear-unconfirmed 30 --apply"
\ No newline at end of file
+php artisan digest:clear-nonces 60
+php artisan accounts:clear-api-keys 60
+php artisan accounts:clear-accounts-tombstones 7 --apply
+php artisan accounts:clear-unconfirmed 30 --apply
\ No newline at end of file
diff --git a/flexisip-account-manager.spec b/flexisip-account-manager.spec
index 65e52f9..f206d1e 100644
--- a/flexisip-account-manager.spec
+++ b/flexisip-account-manager.spec
@@ -118,11 +118,7 @@ cp httpd/flexisip-account-manager.conf "$RPM_BUILD_ROOT%{apache_conf_path}/"
 
         ln -s %{env_config_file} %{env_symlink_file}
 
-        %if %{with deb}
-            php artisan key:generate
-        %else
-            scl enable rh-php73 "php artisan key:generate"
-        %endif
+        php artisan key:generate
     fi
 
     # Link it once more
@@ -135,12 +131,7 @@ cp httpd/flexisip-account-manager.conf "$RPM_BUILD_ROOT%{apache_conf_path}/"
         echo "sudo -su %{web_user}"
         echo "You need to migrate the database to finish the setup:"
         echo "%{web_user}$ cd %{opt_dir}/flexiapi/"
-
-        %if %{with deb}
-            echo %{web_user}$ php artisan migrate
-        %else
-            echo %{web_user}$ scl enable rh-php73 "php artisan migrate"
-        %endif
+        echo %{web_user}$ php artisan migrate
     fi
 
 %if %{without deb}