From 8bc13858f70633ec2ec2ade2b878759a3d6715b0 Mon Sep 17 00:00:00 2001 From: Tyler Moore Date: Thu, 8 Aug 2024 11:56:32 -0600 Subject: [PATCH 1/2] Fix Stubborn Woocommerce "Delivered" Status Check --- gui/modules/api/licensemanager/classes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/modules/api/licensemanager/classes.py b/gui/modules/api/licensemanager/classes.py index b50c4885..e3a6c903 100644 --- a/gui/modules/api/licensemanager/classes.py +++ b/gui/modules/api/licensemanager/classes.py @@ -142,7 +142,7 @@ def expires(self): @property def active(self): - return self._status == 3 and self._times_activated > 0 and self.expires > datetime.datetime.now() + return (self._status == 3 or self._status == 2) and self._times_activated > 0 and self.expires > datetime.datetime.now() @property def license_key(self): From 59a745237cd9586f8dc2224a423365724a90ad21 Mon Sep 17 00:00:00 2001 From: Mack Hendricks Date: Tue, 13 Aug 2024 06:07:37 -0400 Subject: [PATCH 2/2] Update dsiprouter.sh Removed the creation of swap and removal of swap from the installer until we review the effects on different operating systems. --- dsiprouter.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dsiprouter.sh b/dsiprouter.sh index 2451a609..924b11a7 100755 --- a/dsiprouter.sh +++ b/dsiprouter.sh @@ -3650,7 +3650,7 @@ function createSwapFile() { ( grep -vF "$SWAP_FILE" /etc/fstab echo "${SWAP_FILE} none swap sw 0 0" - ) >/etc/fstab && + ) >>/etc/fstab && printdbg 'swapfile created successfully' fi @@ -3839,7 +3839,7 @@ function processCMD() { case $ARG in install) # always add official repo's, set platform, and create init service - RUN_COMMANDS+=(configureSystemRepos setCloudPlatform createInitService createSwapFile installDsiprouterCli) + RUN_COMMANDS+=(configureSystemRepos setCloudPlatform createInitService installDsiprouterCli) shift local NEW_ROOT_DB_USER="" NEW_ROOT_DB_PASS="" NEW_ROOT_DB_NAME="" DB_CONN_URI="" TMP_ARG="" @@ -4092,7 +4092,7 @@ function processCMD() { # same goes for official repo configs, we only remove if all dsiprouter configs are being removed -all|--all) DEFAULT_SERVICES=0 - RUN_COMMANDS+=(uninstallRTPEngine uninstallDsiprouter uninstallNginx uninstallKamailio uninstallMysql uninstallDnsmasq uninstallSipsak uninstallDsiprouterCli removeSwapFile removeInitService removeDsipSystemConfig) + RUN_COMMANDS+=(uninstallRTPEngine uninstallDsiprouter uninstallNginx uninstallKamailio uninstallMysql uninstallDnsmasq uninstallSipsak uninstallDsiprouterCli removeInitService removeDsipSystemConfig) shift ;; *) # fail on unknown option