From d68f081c8a1516474e50777a0aeb84aae7a5bab9 Mon Sep 17 00:00:00 2001 From: usmannasir Date: Mon, 7 Oct 2024 13:53:35 +0500 Subject: [PATCH] bug fix: csf causing bug while site creation --- plogical/firewallUtilities.py | 12 +++++------- plogical/upgrade.py | 5 +++++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/plogical/firewallUtilities.py b/plogical/firewallUtilities.py index 45fd22b7d..ebabbbb1c 100755 --- a/plogical/firewallUtilities.py +++ b/plogical/firewallUtilities.py @@ -2,13 +2,11 @@ import os import os.path import sys -try: - import django - sys.path.append('/usr/local/CyberCP') - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings") - django.setup() -except: - pass + +import django +sys.path.append('/usr/local/CyberCP') +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings") +django.setup() import plogical.CyberCPLogFileWriter as logging import argparse diff --git a/plogical/upgrade.py b/plogical/upgrade.py index 323a3e5c9..b5ebd5051 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -3552,6 +3552,11 @@ pm.max_spare_servers = 3 command = 'csf -uf' Upgrade.executioner(command, 'fix csf if there', 0) + if os.path.exists('/usr/local/CyberCP/configservercsf'): + command = 'cat /dev/null > /usr/local/CyberCP/configservercsf/signals.py' + Upgrade.executioner(command, 'Start LSCPD', 1) + + sed_commands = [ 'sed -i "s/url(r\'^configservercsf/path(\'configservercsf/g" /usr/local/CyberCP/CyberCP/urls.py', 'sed -i "s/from django.conf.urls import url/from django.urls import path/g" /usr/local/CyberCP/configservercsf/urls.py',