Tried to fix updx cache permissions

diff --git a/config/updxlrator/download b/config/updxlrator/download
index ff86155b5538b546d42ca25969174bbef4315da4..29548708ca1effd6868a0445f7d31c6c1d375280 100644 (file)
--- a/config/updxlrator/download
+++ b/config/updxlrator/download
@@ -49,7 +49,6 @@ $vendorid =~ tr/A-Z/a-z/;
 unless (-d "$repository/download/$vendorid")
 {
        system("mkdir -p $repository/download/$vendorid");
-       system("chown -R nobody.squid $repository/download/$vendorid");
        system("chmod 775 $repository/download/$vendorid");
 }
 
@@ -159,15 +158,13 @@ if ($_ == 0)
 
        unless (-d "$repository/$vendorid")
        {
-  system("mkdir -p $repository/$vendorid");
-               system("chown -R nobody.squid $repository/$vendorid");
+               system("mkdir -p $repository/$vendorid");
                system("chmod 775 $repository/$vendorid");
        }
 
        unless (-d "$repository/$vendorid/$uuid")
        {
                system("mkdir -p $repository/$vendorid/$uuid");
-               system("chown -R nobody.squid $repository/$vendorid/$uuid");
                system("chmod 775 $repository/$vendorid/$uuid");
        }
 
@@ -183,7 +180,7 @@ if ($_ == 0)
        &UPDXLT::setcachestatus("$repository/$vendorid/$uuid/checkup.log",time);
        &UPDXLT::setcachestatus("$repository/$vendorid/$uuid/access.log",time);
 
-       system("chown -R nobody.squid $repository/$vendorid/$uuid/*");
+       system("/usr/local/bin/squidctrl setperms");
        system("chmod 775 $repository/$vendorid/$uuid/*");
 
        unlink ("$repository/download/$vendorid/$updatefile.info");

diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid
index 85c1a4311f611a6389710ad064c690a0617f3b39..35ad8a87ad5a324d42f4df58a16d719d9c8a395d 100644 (file)
--- a/src/initscripts/init.d/squid
+++ b/src/initscripts/init.d/squid
@@ -106,6 +106,9 @@ case "$1" in
                sleep 1
                $0 start
                ;;
+       setperms)
+               chown -R nobody.squid /var/updatecache/
+               ;;
 
        *)
                echo "Usage: $0 {start|stop|restart|status|flush}"

diff --git a/src/misc-progs/squidctrl.c b/src/misc-progs/squidctrl.c
index 9f3ba5dd9a3a9acc83e3a727174bd5cc7f356913..6493309989c7acee4918283a0ae5abe3168c911b 100644 (file)
--- a/src/misc-progs/squidctrl.c
+++ b/src/misc-progs/squidctrl.c
@@ -38,8 +38,10 @@ int main(int argc, char *argv[]) {
                safe_system("ln -fs ../init.d/squid /etc/rc.d/rc6.d/K00squid >/dev/null 2>&1");
        } else if (strcmp(argv[1], "disable") == 0) {
                safe_system("rm -f /etc/rc.d/rc*.d/*squid >/dev/null 2>&1");
+       } else if (strcmp(argv[1], "setperms") == 0) {
+               safe_system("/etc/rc.d/init.d/squid setperms");
        } else {
-               fprintf(stderr, "\nBad argument given.\n\nsquidctrl (start|stop|restart|flush|reconfigure)\n\n");
+               fprintf(stderr, "\nBad argument given.\n\nsquidctrl (start|stop|restart|flush|reconfigure|setperms)\n\n");
                exit(1);
        }