Changeset 1148

Timestamp:

Apr 8, 2016, 12:39:28 PM (3 years ago)

Author:

mabarracus

Message:

fix squid3 paths

Location:

n4d-proxy/trunk/fuentes

Files:

• debian/changelog (modified) (4 diffs)
• debian/n4d-proxy.postinst (modified) (5 diffs)
• install.n4d-proxy/etc/default/squid3 (modified) (1 diff)
• install.n4d-proxy/usr/bin/lliurex-proxy-cleaner (modified) (2 diffs)
• install.n4d-proxy/usr/share/n4d/python-plugins/ProxyManager.py (modified) (2 diffs)
• install.n4d-proxy/usr/share/n4d/templates/squid/squid.conf (modified) (3 diffs)

n4d-proxy/trunk/fuentes/debian/changelog

@@ +1 @@
+n4d-proxy (0.48-2) xenial; urgency=medium
+
+  * Fix 
+
+ -- M.Angel Juan <m.angel.juan@gmail.com>  Fri, 08 Apr 2016 12:39:14 +0200
+
 n4d-proxy (0.48-1) xenial; urgency=medium
 
@@ -7 +13 @@
 n4d-proxy (0.48) xenial; urgency=medium
 
-  * Updated squid3->squid paths 
+  * Updated squid->squid paths 
 
  -- M.Angel Juan <m.angel.juan@gmail.com>  Fri, 08 Apr 2016 12:10:18 +0200
@@ -25 +31 @@
 n4d-proxy (0.45) trusty; urgency=high
 
-  * This version reboot squid3
+  * This version reboot squid
 
  -- Raul Rodrigo Segura <raurodse@gmail.com>  Thu, 12 Nov 2015 16:29:47 +0100
@@ -166 +172 @@
 n4d-proxy (0.22) precise; urgency=low
 
-  * Added dns configuration to squid3
+  * Added dns configuration to squid
 
  -- David Montalva Furio <montalva_dav@gva.es>  Mon, 28 Oct 2013 11:22:48 +0100

n4d-proxy/trunk/fuentes/debian/n4d-proxy.postinst

@@ -5 +5 @@
 case "$1" in
    configure|upgrade)
-        #mkdir -p /var/run/squid3
-        #chown proxy:proxy /var/run/squid3
+        #mkdir -p /var/run/squid
+        #chown proxy:proxy /var/run/squid
         #service dnsmasq restart || true
         a2ensite proxy || true
@@ -22 +22 @@
                         sed -i -e "/^$/d" $SSL_PORTS_FILE
                         
-                        invoke-rc.d squid3 restart || true
+                        invoke-rc.d squid restart || true
                         
                 fi
@@ -39 +39 @@
                         echo "\n\n# Lliurex - Enabling single-name resolution\ndns_defnames on\n" >> $SQUID_CONF
                         
-                        invoke-rc.d squid3 restart || true
+                        invoke-rc.d squid restart || true
                 
                 fi
@@ -65 +65 @@
                         fi
                         echo "adding deny domain file list..."
-                        sed -i '/acl deny_domain dstdomain \"\/etc\/squid3\/lliurex\/deny-dst-domains.conf\"/i acl deny_domain_expr dstdom_regex \"\/etc\/squid3\/lliurex\/deny-dst-domains-expr.conf\"' $SQUID_CONF
+                        sed -i '/acl deny_domain dstdomain \"\/etc\/squid\/lliurex\/deny-dst-domains.conf\"/i acl deny_domain_expr dstdom_regex \"\/etc\/squid\/lliurex\/deny-dst-domains-expr.conf\"' $SQUID_CONF
                         echo "adding deny domain expresions acl..."
                         sed -i '/^http_access deny deny_domain/i http_access deny deny_domain_expr ' $SQUID_CONF
@@ -73 +73 @@
         n4d-modules enable-plugin /etc/n4d/conf.d/ProxyManager || true
 
-        invoke-rc.d squid3 restart || true
+        invoke-rc.d squid restart || true
         ;;
    abort-upgrade|abort-remove|abort-deconfigure)

n4d-proxy/trunk/fuentes/install.n4d-proxy/etc/default/squid3

@@ -1 @@
-PIDFILE=/var/run/squid3/squid3.pid
+PIDFILE=/var/run/squid/squid.pid

n4d-proxy/trunk/fuentes/install.n4d-proxy/usr/bin/lliurex-proxy-cleaner

@@ -2 +2 @@
 
 logger -t "lliurex-squid-cleaner" "Cleaning system"
-if [ -f /var/spool/squid3/swap.state ]; then
-        #:> /var/spool/squid3/swap.state
-        FILENAME=/var/spool/squid3/swap.state
+if [ -f /var/spool/squid/swap.state ]; then
+        #:> /var/spool/squid/swap.state
+        FILENAME=/var/spool/squid/swap.state
         SIZE=$(du -sb $FILENAME | awk '{ print $1 }')
 
@@ -11 +11 @@
         else 
             logger -t "lliurex-squid-cleaner" echo "Cleanup SQUID3"
-            sudo service squid3 stop
-            rm -f /var/spool/squid3/swap.*
-            sudo service squid3 start
+            sudo service squid stop
+            rm -f /var/spool/squid/swap.*
+            sudo service squid start
                 
         fi

n4d-proxy/trunk/fuentes/install.n4d-proxy/usr/share/n4d/python-plugins/ProxyManager.py

@@ -133 +133 @@
                                         print llx14_ex
                                         
-                                os.system("service squid3 restart")
+                                os.system("service squid restart")
                                                 
                                 return [True,""]
@@ -361 +361 @@
         def reboot_squid(self):
                 #Restart nfs service
-                subprocess.Popen(['/etc/init.d/squid3','restart'],stdout=subprocess.PIPE).communicate()
+                subprocess.Popen(['/etc/init.d/squid','restart'],stdout=subprocess.PIPE).communicate()
                 return {'status':True,'msg':'SQUID3 rebooted'}
         #def reboot_squid

n4d-proxy/trunk/fuentes/install.n4d-proxy/usr/share/n4d/templates/squid/squid.conf

@@ -30 +30 @@
 deny_info http://{{ PROXY_HOST }}/lliurex-proxy/deny deny_dst
 # set cache dir size in MB in 16 folders with 256 subfolders, aufs--> multithread with POSIX threads mode
-cache_dir aufs /var/spool/squid3 4000 16 256
+cache_dir aufs /var/spool/squid 4000 16 256
 # set the RAM memory used by squid (recommends 1/3 of total ram memory)
 cache_mem 512 MB
 # objects bigger than this size aren't stored in cache
 maximum_object_size {{ PROXY_MAX_FILE_SIZE }} KB
-pid_filename /var/run/squid3.pid
+pid_filename /var/run/squid.pid
 
 
@@ -72 +72 @@
 hierarchy_stoplist cgi-bin ?
 
-access_log /var/log/squid3/access.log squid
+access_log /var/log/squid/access.log squid
 
 refresh_pattern ^ftp:           1440  20%       10080
@@ -81 +81 @@
 icp_port 3130
 
-coredump_dir /var/spool/squid3
+coredump_dir /var/spool/squid