Changeset 1143
- Timestamp:
- Apr 8, 2016, 12:09:43 PM (5 years ago)
- Location:
- n4d-proxy/trunk/fuentes
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
n4d-proxy/trunk/fuentes/debian/control
r229 r1143 3 3 Priority: optional 4 4 Maintainer: Equipo LliureX <lliurex@gva.es> 5 Uploaders: Angel Berlanas Vicente <lliurex_devel2@edu.gva.es>6 5 Build-Depends: debhelper (>= 8.0.0), n4d-dev 7 6 Standards-Version: 3.8.4 … … 9 8 Package: n4d-proxy 10 9 Pre-Depends: squid3 11 Depends: ${shlibs:Depends}, ${misc:Depends}, python-jinja2, python-llxvars, squid 310 Depends: ${shlibs:Depends}, ${misc:Depends}, python-jinja2, python-llxvars, squid 12 11 Provides: n4d-proxy 13 12 Replaces: n4d-proxy -
n4d-proxy/trunk/fuentes/debian/n4d-proxy.postinst
r695 r1143 12 12 13 13 if dpkg --compare-versions "$2" lt 0.24; then 14 SSL_PORTS_FILE="/etc/squid 3/lliurex/allow-SSL-ports.conf"14 SSL_PORTS_FILE="/etc/squid/lliurex/allow-SSL-ports.conf" 15 15 16 16 if [ -e $SSL_PORTS_FILE ]; then … … 29 29 30 30 if dpkg --compare-versions "$2" lt 0.25; then 31 SSL_PORTS_FILE="/etc/squid 3/lliurex/allow-SSL-ports.conf"32 SQUID_CONF="/etc/squid 3/squid.conf"31 SSL_PORTS_FILE="/etc/squid/lliurex/allow-SSL-ports.conf" 32 SQUID_CONF="/etc/squid/squid.conf" 33 33 34 34 if [ -e $SQUID_CONF ]; then … … 46 46 if dpkg --compare-versions "$2" lt 0.31; then 47 47 TEMPLATE_PATH="/usr/share/n4d/templates/squid/" 48 DENY_DOMAIN_FILE="/etc/squid 3/lliurex/deny-dst-domains.conf"49 DENY_DOMAIN_FILE_EXPR="/etc/squid 3/lliurex/deny-dst-domains-expr.conf"50 DENY_NETWORKS_FILE="/etc/squid 3/lliurex/deny-dst-networks.conf"51 SQUID_CONF="/etc/squid 3/squid.conf"52 SQUID_LLIUREX_DIR="/etc/squid 3/lliurex/"48 DENY_DOMAIN_FILE="/etc/squid/lliurex/deny-dst-domains.conf" 49 DENY_DOMAIN_FILE_EXPR="/etc/squid/lliurex/deny-dst-domains-expr.conf" 50 DENY_NETWORKS_FILE="/etc/squid/lliurex/deny-dst-networks.conf" 51 SQUID_CONF="/etc/squid/squid.conf" 52 SQUID_LLIUREX_DIR="/etc/squid/lliurex/" 53 53 if [ -e $SQUID_CONF ]; then 54 54 echo "Fixing htcp_access..." -
n4d-proxy/trunk/fuentes/install.n4d-proxy/usr/share/n4d/python-plugins/ProxyManager.py
r229 r1143 17 17 #Load template file 18 18 self.tpl_env = Environment(loader=FileSystemLoader('/usr/share/n4d/templates/squid')) 19 self.proxy_file_list=["/etc/squid 3/squid.conf","/var/www/proxy.pac","/var/lib/dnsmasq/config/cname-proxy"]20 self.proxy_dirs=["/etc/squid 3/lliurex/"]19 self.proxy_file_list=["/etc/squid/squid.conf","/var/www/proxy.pac","/var/lib/dnsmasq/config/cname-proxy"] 20 self.proxy_dirs=["/etc/squid/lliurex/"] 21 21 22 22 #def init … … 116 116 print("[ProxyManager] Fixing squid.conf ...") 117 117 118 f=open("/etc/squid 3/squid.conf")118 f=open("/etc/squid/squid.conf") 119 119 lines=f.readlines() 120 120 f.close() … … 128 128 f.close() 129 129 130 shutil.copy("/tmp/squid.conf","/etc/squid 3/squid.conf")130 shutil.copy("/tmp/squid.conf","/etc/squid/squid.conf") 131 131 132 132 except Exception as llx14_ex: … … 243 243 os.close(fd) 244 244 #Write template values 245 n4d_mv(tmpfilepath,'/etc/squid 3/squid.conf',True,'root','root','0644',False )245 n4d_mv(tmpfilepath,'/etc/squid/squid.conf',True,'root','root','0644',False ) 246 246 247 247 #Encode vars to UTF-8 … … 254 254 os.close(fd) 255 255 #Write template values 256 n4d_mv(tmpfilepath,'/etc/squid 3/lliurex/allow-dst-domains.conf',True,'root','root','0644',True )256 n4d_mv(tmpfilepath,'/etc/squid/lliurex/allow-dst-domains.conf',True,'root','root','0644',True ) 257 257 258 258 #Encode vars to UTF-8 … … 265 265 os.close(fd) 266 266 #Write template values 267 n4d_mv(tmpfilepath,'/etc/squid 3/lliurex/allow-dst-networks.conf',True,'root','root','0644',True )267 n4d_mv(tmpfilepath,'/etc/squid/lliurex/allow-dst-networks.conf',True,'root','root','0644',True ) 268 268 269 269 #Encode vars to UTF-8 … … 276 276 os.close(fd) 277 277 #Write template values 278 n4d_mv(tmpfilepath,'/etc/squid 3/lliurex/allow-src-networks.conf',True,'root','root','0644',True )278 n4d_mv(tmpfilepath,'/etc/squid/lliurex/allow-src-networks.conf',True,'root','root','0644',True ) 279 279 280 280 #Encode vars to UTF-8 … … 287 287 os.close(fd) 288 288 #Write template values 289 n4d_mv(tmpfilepath,'/etc/squid 3/lliurex/allow-SSL-ports.conf',True,'root','root','0644',True )289 n4d_mv(tmpfilepath,'/etc/squid/lliurex/allow-SSL-ports.conf',True,'root','root','0644',True ) 290 290 291 291 #Encode vars to UTF-8 … … 298 298 os.close(fd) 299 299 #Write template values 300 n4d_mv(tmpfilepath,'/etc/squid 3/lliurex/no_cache_networks.conf',True,'root','root','0644',True )300 n4d_mv(tmpfilepath,'/etc/squid/lliurex/no_cache_networks.conf',True,'root','root','0644',True ) 301 301 302 302 #Encode vars to UTF-8 … … 331 331 os.close(fd) 332 332 #Write template values 333 n4d_mv(tmpfilepath,'/etc/squid 3/lliurex/deny-dst-domains.conf',True,'root','root','0644',True )333 n4d_mv(tmpfilepath,'/etc/squid/lliurex/deny-dst-domains.conf',True,'root','root','0644',True ) 334 334 335 335 #deny-dst-domains-expr … … 342 342 os.close(fd) 343 343 #Write template values 344 n4d_mv(tmpfilepath,'/etc/squid 3/lliurex/deny-dst-domains-expr.conf',True,'root','root','0644',True )344 n4d_mv(tmpfilepath,'/etc/squid/lliurex/deny-dst-domains-expr.conf',True,'root','root','0644',True ) 345 345 346 346 #deny-dst-networks … … 353 353 os.close(fd) 354 354 #Write template values 355 n4d_mv(tmpfilepath,'/etc/squid 3/lliurex/deny-dst-networks.conf',True,'root','root','0644',True )355 n4d_mv(tmpfilepath,'/etc/squid/lliurex/deny-dst-networks.conf',True,'root','root','0644',True ) 356 356 357 357 -
n4d-proxy/trunk/fuentes/install.n4d-proxy/usr/share/n4d/templates/squid/squid.conf
r695 r1143 1 1 ### BEGIN LLIUREX_CHANGES ### 2 # /etc/squid 3/squid.conf2 # /etc/squid/squid.conf 3 3 # 4 4 ###################################################### … … 16 16 #enabling ipv4 resolution first 17 17 dns_v4_first on 18 acl SSL_ports port "/etc/squid 3/lliurex/allow-SSL-ports.conf"19 acl our_networks src "/etc/squid 3/lliurex/allow-src-networks.conf"20 acl allow_dst dst "/etc/squid 3/lliurex/allow-dst-networks.conf"21 acl deny_dst dst "/etc/squid 3/lliurex/deny-dst-networks.conf"22 acl allow_domain dstdomain "/etc/squid 3/lliurex/allow-dst-domains.conf"23 acl deny_domain dstdomain "/etc/squid 3/lliurex/deny-dst-domains.conf"24 acl deny_domain_expr dstdom_regex "/etc/squid 3/lliurex/deny-dst-domains-expr.conf"18 acl SSL_ports port "/etc/squid/lliurex/allow-SSL-ports.conf" 19 acl our_networks src "/etc/squid/lliurex/allow-src-networks.conf" 20 acl allow_dst dst "/etc/squid/lliurex/allow-dst-networks.conf" 21 acl deny_dst dst "/etc/squid/lliurex/deny-dst-networks.conf" 22 acl allow_domain dstdomain "/etc/squid/lliurex/allow-dst-domains.conf" 23 acl deny_domain dstdomain "/etc/squid/lliurex/deny-dst-domains.conf" 24 acl deny_domain_expr dstdom_regex "/etc/squid/lliurex/deny-dst-domains-expr.conf" 25 25 26 26 27 acl HOSTS dst "/etc/squid 3/lliurex/no_cache_networks.conf"27 acl HOSTS dst "/etc/squid/lliurex/no_cache_networks.conf" 28 28 no_cache deny HOSTS 29 29 deny_info http://{{ PROXY_HOST }}/lliurex-proxy/deny allow_dst
Note: See TracChangeset
for help on using the changeset viewer.