Changeset 1146 for lliurex-guard

Timestamp:

Apr 8, 2016, 12:13:57 PM (4 years ago)

Author:

mabarracus

Message:

Updated squid paths

Location:

lliurex-guard/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• lliurex-guard-n4d.install/usr/share/n4d/python-plugins/Lliurex-guard.py (modified) (4 diffs)

lliurex-guard/trunk/fuentes/debian/changelog

@@ +1 @@
+lliurex-guard (4) xenial; urgency=medium
+
+  * Updated squid3->squid paths
+
+ -- M.Angel Juan <m.angel.juan@gmail.com>  Fri, 08 Apr 2016 12:13:37 +0200
+
 lliurex-guard (3) xenial; urgency=high
 

lliurex-guard/trunk/fuentes/lliurex-guard-n4d.install/usr/share/n4d/python-plugins/Lliurex-guard.py

@@ -18 +18 @@
                         print config["classdomain"]
                         
-                        self.generateSquidList("/etc/squid3/lliurex/allow-dst-domains.conf", config["whitelist"], config["classdomain"]);
-                        self.generateSquidList("/etc/squid3/lliurex/deny-dst-domains.conf", config["blacklist"]);
+                        self.generateSquidList("/etc/squid/lliurex/allow-dst-domains.conf", config["whitelist"], config["classdomain"]);
+                        self.generateSquidList("/etc/squid/lliurex/deny-dst-domains.conf", config["blacklist"]);
                         
                         
@@ -133 +133 @@
                 '''
                 try:
-                        orig=open("/etc/squid3/squid.conf", "r");
+                        orig=open("/etc/squid/squid.conf", "r");
                         dest=open("/tmp/squid.conf", "w");
         
@@ -177 +177 @@
                         orig.close()
                         
-                        shutil.copyfile("/tmp/squid.conf", "/etc/squid3/squid.conf")
+                        shutil.copyfile("/tmp/squid.conf", "/etc/squid/squid.conf")
                         
                         # Setting current config
@@ -201 +201 @@
         def generateSquidList(self, destfile, listfiles, extradomain=""):
                 ''' Generates list file 
-                 Commonly /etc/squid3/lliurex/allow-dst-domains.conf  as whitelist
-                 or /etc/squid3/lliurex/deny-dst-domains.conf as blacklist
+                 Commonly /etc/squid/lliurex/allow-dst-domains.conf  as whitelist
+                 or /etc/squid/lliurex/deny-dst-domains.conf as blacklist
                  if listfiles is an empty list, generates an empty file (useful to reset config)
                  '''