Changeset 1148


Ignore:
Timestamp:
Apr 8, 2016, 12:39:28 PM (3 years ago)
Author:
mabarracus
Message:

fix squid3 paths

Location:
n4d-proxy/trunk/fuentes
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • n4d-proxy/trunk/fuentes/debian/changelog

    r1147 r1148  
     1n4d-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
    17n4d-proxy (0.48-1) xenial; urgency=medium
    28
     
    713n4d-proxy (0.48) xenial; urgency=medium
    814
    9   * Updated squid3->squid paths
     15  * Updated squid->squid paths
    1016
    1117 -- M.Angel Juan <m.angel.juan@gmail.com>  Fri, 08 Apr 2016 12:10:18 +0200
     
    2531n4d-proxy (0.45) trusty; urgency=high
    2632
    27   * This version reboot squid3
     33  * This version reboot squid
    2834
    2935 -- Raul Rodrigo Segura <raurodse@gmail.com>  Thu, 12 Nov 2015 16:29:47 +0100
     
    166172n4d-proxy (0.22) precise; urgency=low
    167173
    168   * Added dns configuration to squid3
     174  * Added dns configuration to squid
    169175
    170176 -- 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  
    55case "$1" in
    66   configure|upgrade)
    7         #mkdir -p /var/run/squid3
    8         #chown proxy:proxy /var/run/squid3
     7        #mkdir -p /var/run/squid
     8        #chown proxy:proxy /var/run/squid
    99        #service dnsmasq restart || true
    1010        a2ensite proxy || true
     
    2222                        sed -i -e "/^$/d" $SSL_PORTS_FILE
    2323                       
    24                         invoke-rc.d squid3 restart || true
     24                        invoke-rc.d squid restart || true
    2525                       
    2626                fi
     
    3939                        echo "\n\n# Lliurex - Enabling single-name resolution\ndns_defnames on\n" >> $SQUID_CONF
    4040                       
    41                         invoke-rc.d squid3 restart || true
     41                        invoke-rc.d squid restart || true
    4242               
    4343                fi
     
    6565                        fi
    6666                        echo "adding deny domain file list..."
    67                         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
     67                        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
    6868                        echo "adding deny domain expresions acl..."
    6969                        sed -i '/^http_access deny deny_domain/i http_access deny deny_domain_expr ' $SQUID_CONF
     
    7373        n4d-modules enable-plugin /etc/n4d/conf.d/ProxyManager || true
    7474
    75         invoke-rc.d squid3 restart || true
     75        invoke-rc.d squid restart || true
    7676        ;;
    7777   abort-upgrade|abort-remove|abort-deconfigure)
  • n4d-proxy/trunk/fuentes/install.n4d-proxy/etc/default/squid3

    r229 r1148  
    1 PIDFILE=/var/run/squid3/squid3.pid
     1PIDFILE=/var/run/squid/squid.pid
  • n4d-proxy/trunk/fuentes/install.n4d-proxy/usr/bin/lliurex-proxy-cleaner

    r229 r1148  
    22
    33logger -t "lliurex-squid-cleaner" "Cleaning system"
    4 if [ -f /var/spool/squid3/swap.state ]; then
    5         #:> /var/spool/squid3/swap.state
    6         FILENAME=/var/spool/squid3/swap.state
     4if [ -f /var/spool/squid/swap.state ]; then
     5        #:> /var/spool/squid/swap.state
     6        FILENAME=/var/spool/squid/swap.state
    77        SIZE=$(du -sb $FILENAME | awk '{ print $1 }')
    88
     
    1111        else
    1212            logger -t "lliurex-squid-cleaner" echo "Cleanup SQUID3"
    13             sudo service squid3 stop
    14             rm -f /var/spool/squid3/swap.*
    15             sudo service squid3 start
     13            sudo service squid stop
     14            rm -f /var/spool/squid/swap.*
     15            sudo service squid start
    1616               
    1717        fi
  • n4d-proxy/trunk/fuentes/install.n4d-proxy/usr/share/n4d/python-plugins/ProxyManager.py

    r1143 r1148  
    133133                                        print llx14_ex
    134134                                       
    135                                 os.system("service squid3 restart")
     135                                os.system("service squid restart")
    136136                                               
    137137                                return [True,""]
     
    361361        def reboot_squid(self):
    362362                #Restart nfs service
    363                 subprocess.Popen(['/etc/init.d/squid3','restart'],stdout=subprocess.PIPE).communicate()
     363                subprocess.Popen(['/etc/init.d/squid','restart'],stdout=subprocess.PIPE).communicate()
    364364                return {'status':True,'msg':'SQUID3 rebooted'}
    365365        #def reboot_squid
  • n4d-proxy/trunk/fuentes/install.n4d-proxy/usr/share/n4d/templates/squid/squid.conf

    r1143 r1148  
    3030deny_info http://{{ PROXY_HOST }}/lliurex-proxy/deny deny_dst
    3131# set cache dir size in MB in 16 folders with 256 subfolders, aufs--> multithread with POSIX threads mode
    32 cache_dir aufs /var/spool/squid3 4000 16 256
     32cache_dir aufs /var/spool/squid 4000 16 256
    3333# set the RAM memory used by squid (recommends 1/3 of total ram memory)
    3434cache_mem 512 MB
    3535# objects bigger than this size aren't stored in cache
    3636maximum_object_size {{ PROXY_MAX_FILE_SIZE }} KB
    37 pid_filename /var/run/squid3.pid
     37pid_filename /var/run/squid.pid
    3838
    3939
     
    7272hierarchy_stoplist cgi-bin ?
    7373
    74 access_log /var/log/squid3/access.log squid
     74access_log /var/log/squid/access.log squid
    7575
    7676refresh_pattern ^ftp:           1440  20%       10080
     
    8181icp_port 3130
    8282
    83 coredump_dir /var/spool/squid3
     83coredump_dir /var/spool/squid
Note: See TracChangeset for help on using the changeset viewer.