squid: minor changes in Makefile and init script
authorMarko Ratkaj <marko.ratkaj@sartura.hr>
Mon, 8 Jun 2015 13:12:15 +0000 (15:12 +0200)
committerLuka Perkov <luka@openwrt.org>
Tue, 9 Jun 2015 10:15:36 +0000 (12:15 +0200)
Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>
net/squid/Makefile
net/squid/files/squid.init

index da43127c418f6dbb0735bac3faa190ee9b68c857..1d34d26ca0defa4dd4e25468944a481f9106a5e5 100644 (file)
@@ -89,11 +89,11 @@ CONFIGURE_ARGS += \
        --disable-arch-native \
        --with-krb5-config=no \
        --without-libcap \
-       --without-netfilter-conntrack \
+       --without-netfilter-conntrack
 
 CONFIGURE_VARS += \
        ac_cv_header_linux_netfilter_ipv4_h=yes \
-       ac_cv_epoll_works=yes \
+       ac_cv_epoll_works=yes
 
 define Build/Compile
        +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/lib all
index 8b3094840d61610d834b6a9e5546d2bcb81beb23..35d86c87782defd39b4149bcb86bffb458e0ae87 100644 (file)
@@ -25,7 +25,9 @@ start_service() {
                return 1
        }
 
-       mkdir -p $(dirname $CONFIGFILE)
+       config_dir=$(dirname $CONFIGFILE)
+       [ -d $config_dir ] || mkdir -p $config_dir && chown nobody:nogroup $config_dir
+       [ -d $coredump_dir ] || mkdir -p $coredump_dir && chown nobody:nogroup $coredump_dir
 
        cat $config_file > $CONFIGFILE
        echo http_port $http_port >> $CONFIGFILE