Changeset 1148
- Timestamp:
- Apr 8, 2016, 12:39:28 PM (5 years ago)
- Location:
- n4d-proxy/trunk/fuentes
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
n4d-proxy/trunk/fuentes/debian/changelog
r1147 r1148 1 n4d-proxy (0.48-2) xenial; urgency=medium 2 3 * Fix 4 5 -- M.Angel Juan <m.angel.juan@gmail.com> Fri, 08 Apr 2016 12:39:14 +0200 6 1 7 n4d-proxy (0.48-1) xenial; urgency=medium 2 8 … … 7 13 n4d-proxy (0.48) xenial; urgency=medium 8 14 9 * Updated squid 3->squid paths15 * Updated squid->squid paths 10 16 11 17 -- 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 26 32 27 * This version reboot squid 333 * This version reboot squid 28 34 29 35 -- Raul Rodrigo Segura <raurodse@gmail.com> Thu, 12 Nov 2015 16:29:47 +0100 … … 166 172 n4d-proxy (0.22) precise; urgency=low 167 173 168 * Added dns configuration to squid 3174 * Added dns configuration to squid 169 175 170 176 -- David Montalva Furio <montalva_dav@gva.es> Mon, 28 Oct 2013 11:22:48 +0100 -
n4d-proxy/trunk/fuentes/debian/n4d-proxy.postinst
r1143 r1148 5 5 case "$1" in 6 6 configure|upgrade) 7 #mkdir -p /var/run/squid 38 #chown proxy:proxy /var/run/squid 37 #mkdir -p /var/run/squid 8 #chown proxy:proxy /var/run/squid 9 9 #service dnsmasq restart || true 10 10 a2ensite proxy || true … … 22 22 sed -i -e "/^$/d" $SSL_PORTS_FILE 23 23 24 invoke-rc.d squid 3restart || true24 invoke-rc.d squid restart || true 25 25 26 26 fi … … 39 39 echo "\n\n# Lliurex - Enabling single-name resolution\ndns_defnames on\n" >> $SQUID_CONF 40 40 41 invoke-rc.d squid 3restart || true41 invoke-rc.d squid restart || true 42 42 43 43 fi … … 65 65 fi 66 66 echo "adding deny domain file list..." 67 sed -i '/acl deny_domain dstdomain \"\/etc\/squid 3\/lliurex\/deny-dst-domains.conf\"/i acl deny_domain_expr dstdom_regex \"\/etc\/squid3\/lliurex\/deny-dst-domains-expr.conf\"' $SQUID_CONF67 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 68 68 echo "adding deny domain expresions acl..." 69 69 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 74 74 75 invoke-rc.d squid 3restart || true75 invoke-rc.d squid restart || true 76 76 ;; 77 77 abort-upgrade|abort-remove|abort-deconfigure) -
n4d-proxy/trunk/fuentes/install.n4d-proxy/etc/default/squid3
r229 r1148 1 PIDFILE=/var/run/squid 3/squid3.pid1 PIDFILE=/var/run/squid/squid.pid -
n4d-proxy/trunk/fuentes/install.n4d-proxy/usr/bin/lliurex-proxy-cleaner
r229 r1148 2 2 3 3 logger -t "lliurex-squid-cleaner" "Cleaning system" 4 if [ -f /var/spool/squid 3/swap.state ]; then5 #:> /var/spool/squid 3/swap.state6 FILENAME=/var/spool/squid 3/swap.state4 if [ -f /var/spool/squid/swap.state ]; then 5 #:> /var/spool/squid/swap.state 6 FILENAME=/var/spool/squid/swap.state 7 7 SIZE=$(du -sb $FILENAME | awk '{ print $1 }') 8 8 … … 11 11 else 12 12 logger -t "lliurex-squid-cleaner" echo "Cleanup SQUID3" 13 sudo service squid 3stop14 rm -f /var/spool/squid 3/swap.*15 sudo service squid 3start13 sudo service squid stop 14 rm -f /var/spool/squid/swap.* 15 sudo service squid start 16 16 17 17 fi -
n4d-proxy/trunk/fuentes/install.n4d-proxy/usr/share/n4d/python-plugins/ProxyManager.py
r1143 r1148 133 133 print llx14_ex 134 134 135 os.system("service squid 3restart")135 os.system("service squid restart") 136 136 137 137 return [True,""] … … 361 361 def reboot_squid(self): 362 362 #Restart nfs service 363 subprocess.Popen(['/etc/init.d/squid 3','restart'],stdout=subprocess.PIPE).communicate()363 subprocess.Popen(['/etc/init.d/squid','restart'],stdout=subprocess.PIPE).communicate() 364 364 return {'status':True,'msg':'SQUID3 rebooted'} 365 365 #def reboot_squid -
n4d-proxy/trunk/fuentes/install.n4d-proxy/usr/share/n4d/templates/squid/squid.conf
r1143 r1148 30 30 deny_info http://{{ PROXY_HOST }}/lliurex-proxy/deny deny_dst 31 31 # set cache dir size in MB in 16 folders with 256 subfolders, aufs--> multithread with POSIX threads mode 32 cache_dir aufs /var/spool/squid 34000 16 25632 cache_dir aufs /var/spool/squid 4000 16 256 33 33 # set the RAM memory used by squid (recommends 1/3 of total ram memory) 34 34 cache_mem 512 MB 35 35 # objects bigger than this size aren't stored in cache 36 36 maximum_object_size {{ PROXY_MAX_FILE_SIZE }} KB 37 pid_filename /var/run/squid 3.pid37 pid_filename /var/run/squid.pid 38 38 39 39 … … 72 72 hierarchy_stoplist cgi-bin ? 73 73 74 access_log /var/log/squid 3/access.log squid74 access_log /var/log/squid/access.log squid 75 75 76 76 refresh_pattern ^ftp: 1440 20% 10080 … … 81 81 icp_port 3130 82 82 83 coredump_dir /var/spool/squid 383 coredump_dir /var/spool/squid
Note: See TracChangeset
for help on using the changeset viewer.