[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 0f860889ab02872ede525a78de9e22d29b54277d

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 0f860889ab02872ede525a78de9e22d29b54277d

[git]

[-- Attachment #1: Type: text/plain, Size: 2083 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  0f860889ab02872ede525a78de9e22d29b54277d (commit)
      from  5b71042c5426855ee58a56d16d11a4cc5d0f5253 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0f860889ab02872ede525a78de9e22d29b54277d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Jul 17 21:03:53 2014 +0200

    core80: Fix configuration update and resurrect permissions.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/80/update.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/80/update.sh b/config/rootfiles/core/80/update.sh
index baba3e2..b8b5b58 100644
--- a/config/rootfiles/core/80/update.sh
+++ b/config/rootfiles/core/80/update.sh
@@ -61,13 +61,19 @@ rm -f \
 	/opt/pakfire/db/rootfiles/libgpg-error
 
 # Regenerate squid configuration file
-/srv/web/ipfire/cgi-bin/proxy.cgi
+sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi
 
-# Generate ddns configuration file
-/srv/web/ipfire/cgi-bin/ddns.cgi
+# Fix broken proxy configuration permissions
+chown -R nobody.nobody \
+	/var/ipfire/proxy/advanced \
+	/var/ipfire/proxy/acl-1.4 \
+	/var/ipfire/proxy/enable \
+	/var/ipfire/proxy/settings \
+	/var/ipfire/proxy/squid.conf \
+	/var/ipfire/proxy/transparent
 
-touch /var/ipfire/ddns/ddns.conf
-chown nobody.nobody /var/ipfire/ddns/ddns.conf
+# Generate ddns configuration file
+sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi
 
 # Update crontab
 sed -i /var/spool/cron/root.orig -e "/setddns.pl/d"


hooks/post-receive
--
IPFire 2.x development tree