((defined($proxysettings{'SUPERVISOR_PASSWORD'})) && ($proxysettings{'SUPERVISOR_PASSWORD'} eq '')))
{
&write_acl;
- system("/usr/local/bin/restartsquid");
+ system("/usr/local/bin/squidctrl restart >/dev/null 2>&1");
}
}
for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dmzholes \
ethernet extrahd/bin fwlogs isdn key langs logging main mbmon menu.d modem net-traffic \
nfs optionsfw outgoing/bin patches pakfire portfw \
- ppp private proxy/advanced proxy/calamaris/bin qos/bin red remote snort time tripwire/report \
+ ppp private proxy/advanced/cre proxy/calamaris/bin qos/bin red remote snort time tripwire/report \
updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin upnp vpn \
wakeonlan wireless xtaccess ; do \
mkdir -p $(CONFIG_ROOT)/$$i; \
extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings\
isdn/settings main/hosts main/settings optionsfw/settings outgoing/settings outgoing/rules pakfire/settings \
portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
- ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
+ ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
qos/tosconfig snort/settings tripwire/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \
vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \
touch $(CONFIG_ROOT)/$$i; \
@rm -rf $(DIR_APP)
-mkdir -p /opt/pakfire/{cache,db/{meta,lists,rootfiles},etc,lib,logs,tmp}
cp -fRv $(DIR_SRC)/src/pakfire/* $(DIR_APP)
- cp -vf $(DIR_SRC)/src/pakfire/pakfire.conf $(DIR_APP)/etc/
+ mv -vf $(DIR_APP)/pakfire.conf $(DIR_APP)/etc/
chown root.root $(DIR_APP) -R
chmod 755 $(DIR_APP)/pakfire
-cd $(DIR_APP) && find $(DIR_APP) -name .svn -exec rm -rf {} \;