Signed-off-by: Erik Kapfer ummeegge@ipfire.org --- config/rootfiles/core/133/update.sh | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/config/rootfiles/core/133/update.sh b/config/rootfiles/core/133/update.sh index a05ad0741..3ecb5651b 100644 --- a/config/rootfiles/core/133/update.sh +++ b/config/rootfiles/core/133/update.sh @@ -71,6 +71,11 @@ sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi /etc/init.d/squid start /etc/init.d/collectd restart
+# Set new permissions for tor +if [ -d "/var/lib/tor" ]; then + chown -R tor:tor /var/lib/tor +fi + # Finish /etc/init.d/fireinfo start sendprofile
Hi,
Thanks for sending in that patch.
But I think instead of doing this in the Core Update, this change should be applied in the tor update scripts.
-Michael
On 10 Jun 2019, at 12:36, Erik Kapfer ummeegge@ipfire.org wrote:
Signed-off-by: Erik Kapfer ummeegge@ipfire.org
config/rootfiles/core/133/update.sh | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/config/rootfiles/core/133/update.sh b/config/rootfiles/core/133/update.sh index a05ad0741..3ecb5651b 100644 --- a/config/rootfiles/core/133/update.sh +++ b/config/rootfiles/core/133/update.sh @@ -71,6 +71,11 @@ sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi /etc/init.d/squid start /etc/init.d/collectd restart
+# Set new permissions for tor +if [ -d "/var/lib/tor" ]; then
- chown -R tor:tor /var/lib/tor
+fi
# Finish /etc/init.d/fireinfo start sendprofile -- 2.12.2
Hello Michael,
as mentioned in https://bugzilla.ipfire.org/show_bug.cgi?id=12088#c11 , the "install.sh" script of the Tor addon contains all required steps.
Since "update.sh" calls "install.sh" at the end of the file, everything should be fine after an update as well - which is not. However, due to this, I do not think putting it into "update.sh" makes sense either.
Thanks, and best regards, Peter Müller
Michael Tremer:
Hi,
Thanks for sending in that patch.
But I think instead of doing this in the Core Update, this change should be applied in the tor update scripts.
-Michael
On 10 Jun 2019, at 12:36, Erik Kapfer ummeegge@ipfire.org wrote:
Signed-off-by: Erik Kapfer ummeegge@ipfire.org
config/rootfiles/core/133/update.sh | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/config/rootfiles/core/133/update.sh b/config/rootfiles/core/133/update.sh index a05ad0741..3ecb5651b 100644 --- a/config/rootfiles/core/133/update.sh +++ b/config/rootfiles/core/133/update.sh @@ -71,6 +71,11 @@ sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi /etc/init.d/squid start /etc/init.d/collectd restart
+# Set new permissions for tor +if [ -d "/var/lib/tor" ]; then
- chown -R tor:tor /var/lib/tor
+fi
# Finish /etc/init.d/fireinfo start sendprofile -- 2.12.2
On 6/10/19 1:12 PM, Peter Müller wrote:
Hello Michael,
as mentioned in https://bugzilla.ipfire.org/show_bug.cgi?id=12088#c11 , the "install.sh" script of the Tor addon contains all required steps.
Since "update.sh" calls "install.sh" at the end of the file, everything should be fine after an update as well - which is not. However, due to this, I do not think putting it into "update.sh" makes sense either.
Thanks, and best regards, Peter Müller
Michael Tremer:
Hi,
Thanks for sending in that patch.
But I think instead of doing this in the Core Update, this change should be applied in the tor update scripts.
-Michael
On 10 Jun 2019, at 12:36, Erik Kapfer ummeegge@ipfire.org wrote:
Signed-off-by: Erik Kapfer ummeegge@ipfire.org
config/rootfiles/core/133/update.sh | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/config/rootfiles/core/133/update.sh b/config/rootfiles/core/133/update.sh index a05ad0741..3ecb5651b 100644 --- a/config/rootfiles/core/133/update.sh +++ b/config/rootfiles/core/133/update.sh @@ -71,6 +71,11 @@ sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi /etc/init.d/squid start /etc/init.d/collectd restart
+# Set new permissions for tor +if [ -d "/var/lib/tor" ]; then
- chown -R tor:tor /var/lib/tor
+fi
# Finish /etc/init.d/fireinfo start sendprofile -- 2.12.2
Perhaps the restore_backup in install.sh is undoing the ownership?
p.
Hi,
Yes that will be it. The backup stores permissions and ownership.
Please move the chown line to after the backup is being restored and you will be fine.
-Michael
On 10 Jun 2019, at 19:36, Paul Simmons mbatranch@gmail.com wrote:
On 6/10/19 1:12 PM, Peter Müller wrote:
Hello Michael,
as mentioned in https://bugzilla.ipfire.org/show_bug.cgi?id=12088#c11 , the "install.sh" script of the Tor addon contains all required steps.
Since "update.sh" calls "install.sh" at the end of the file, everything should be fine after an update as well - which is not. However, due to this, I do not think putting it into "update.sh" makes sense either.
Thanks, and best regards, Peter Müller
Michael Tremer:
Hi,
Thanks for sending in that patch.
But I think instead of doing this in the Core Update, this change should be applied in the tor update scripts.
-Michael
On 10 Jun 2019, at 12:36, Erik Kapfer ummeegge@ipfire.org wrote:
Signed-off-by: Erik Kapfer ummeegge@ipfire.org
config/rootfiles/core/133/update.sh | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/config/rootfiles/core/133/update.sh b/config/rootfiles/core/133/update.sh index a05ad0741..3ecb5651b 100644 --- a/config/rootfiles/core/133/update.sh +++ b/config/rootfiles/core/133/update.sh @@ -71,6 +71,11 @@ sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi /etc/init.d/squid start /etc/init.d/collectd restart
+# Set new permissions for tor +if [ -d "/var/lib/tor" ]; then
- chown -R tor:tor /var/lib/tor
+fi
# Finish /etc/init.d/fireinfo start sendprofile -- 2.12.2
Perhaps the restore_backup in install.sh is undoing the ownership?
p.
Fixes #12088
Signed-off-by: Peter Müller peter.mueller@ipfire.org Reported-by: Erik Kapfer ummeegge@ipfire.org --- lfs/tor | 2 +- src/paks/tor/install.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lfs/tor b/lfs/tor index 1e8c3889d..d918910d4 100644 --- a/lfs/tor +++ b/lfs/tor @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 39 +PAK_VER = 40
DEPS = "libseccomp"
diff --git a/src/paks/tor/install.sh b/src/paks/tor/install.sh index 268bccecd..1659871b6 100644 --- a/src/paks/tor/install.sh +++ b/src/paks/tor/install.sh @@ -32,9 +32,10 @@ if ! getent passwd tor; then useradd -u 119 -g tor -c "Tor daemon user" -d /var/empty -s /bin/false tor fi
+extract_files +restore_backup ${NAME} + # Adjust some folder permission for new UID/GID chown -R tor:tor /var/lib/tor /var/ipfire/tor
-extract_files -restore_backup ${NAME} start_service --background ${NAME}
Hello,
could somebody please merge this patch _before_ closing Core Update 133?
Thanks, and best regards, Peter Müller
Fixes #12088
Signed-off-by: Peter Müller peter.mueller@ipfire.org Reported-by: Erik Kapfer ummeegge@ipfire.org
lfs/tor | 2 +- src/paks/tor/install.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lfs/tor b/lfs/tor index 1e8c3889d..d918910d4 100644 --- a/lfs/tor +++ b/lfs/tor @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 39 +PAK_VER = 40
DEPS = "libseccomp"
diff --git a/src/paks/tor/install.sh b/src/paks/tor/install.sh index 268bccecd..1659871b6 100644 --- a/src/paks/tor/install.sh +++ b/src/paks/tor/install.sh @@ -32,9 +32,10 @@ if ! getent passwd tor; then useradd -u 119 -g tor -c "Tor daemon user" -d /var/empty -s /bin/false tor fi
+extract_files +restore_backup ${NAME}
# Adjust some folder permission for new UID/GID chown -R tor:tor /var/lib/tor /var/ipfire/tor
-extract_files -restore_backup ${NAME} start_service --background ${NAME}
Hi,
err, the update is closed and should be building right now.
But tor is an add-on. So we can build this separately.
-Michael
On 12 Jun 2019, at 14:57, Peter Müller peter.mueller@ipfire.org wrote:
Hello,
could somebody please merge this patch _before_ closing Core Update 133?
Thanks, and best regards, Peter Müller
Fixes #12088
Signed-off-by: Peter Müller peter.mueller@ipfire.org Reported-by: Erik Kapfer ummeegge@ipfire.org
lfs/tor | 2 +- src/paks/tor/install.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lfs/tor b/lfs/tor index 1e8c3889d..d918910d4 100644 --- a/lfs/tor +++ b/lfs/tor @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 39 +PAK_VER = 40
DEPS = "libseccomp"
diff --git a/src/paks/tor/install.sh b/src/paks/tor/install.sh index 268bccecd..1659871b6 100644 --- a/src/paks/tor/install.sh +++ b/src/paks/tor/install.sh @@ -32,9 +32,10 @@ if ! getent passwd tor; then useradd -u 119 -g tor -c "Tor daemon user" -d /var/empty -s /bin/false tor fi
+extract_files +restore_backup ${NAME}
# Adjust some folder permission for new UID/GID chown -R tor:tor /var/lib/tor /var/ipfire/tor
-extract_files -restore_backup ${NAME} start_service --background ${NAME}
-- The road to Hades is easy to travel. -- Bion of Borysthenes
Hello Michael & Peter,
On Mo, 2019-06-10 at 18:12 +0000, Peter Müller wrote:
Hello Michael,
as mentioned in https://bugzilla.ipfire.org/show_bug.cgi?id=12088#c11 , the "install.sh" script of the Tor addon contains all required steps.
Since "update.sh" calls "install.sh" at the end of the file, everything should be fine after an update as well - which is not. However, due to this, I do not think putting it into "update.sh" makes sense either.
Thought a little in the same way since there is also an update for tor whereby tor´s update.sh (includes install.sh then) should be executed. To stay save i used the core update.sh for this...
Best,
Erik
Thanks, and best regards, Peter Müller
Michael Tremer:
Hi,
Thanks for sending in that patch.
But I think instead of doing this in the Core Update, this change should be applied in the tor update scripts.
-Michael
On 10 Jun 2019, at 12:36, Erik Kapfer ummeegge@ipfire.org wrote:
Signed-off-by: Erik Kapfer ummeegge@ipfire.org
config/rootfiles/core/133/update.sh | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/config/rootfiles/core/133/update.sh b/config/rootfiles/core/133/update.sh index a05ad0741..3ecb5651b 100644 --- a/config/rootfiles/core/133/update.sh +++ b/config/rootfiles/core/133/update.sh @@ -71,6 +71,11 @@ sudo -u nobody /srv/web/ipfire/cgi- bin/vpnmain.cgi /etc/init.d/squid start /etc/init.d/collectd restart
+# Set new permissions for tor +if [ -d "/var/lib/tor" ]; then
- chown -R tor:tor /var/lib/tor
+fi
# Finish /etc/init.d/fireinfo start sendprofile -- 2.12.2
-
Erik Kapfer -
Michael Tremer -
Paul Simmons -
Peter Müller -
ummeegge