tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 09:15:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tentacle config file is readable to all users in all packages

Browse Source
This commit is contained in:
fermin831 2018-04-30 16:22:52 +02:00
parent 4bc10e503b
commit b6bc835e41
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_server/DEBIAN/postinst
View File

@ -83,7 +83,7 @@ fi
if [ ! -e /etc/tentacle/tentacle_server.conf ] if [ ! -e /etc/tentacle/tentacle_server.conf ]
then then
cp /usr/share/tentacle_server/conf/tentacle_server.conf.new /etc/tentacle/tentacle_server.conf cp /usr/share/tentacle_server/conf/tentacle_server.conf.new /etc/tentacle/tentacle_server.conf
chmod 600 /etc/tentacle/tentacle_server.conf chmod 664 /etc/tentacle/tentacle_server.conf
else else
cp /usr/share/tentacle_server/conf/tentacle_server.conf.new /etc/tentacle/tentacle_server.conf.new cp /usr/share/tentacle_server/conf/tentacle_server.conf.new /etc/tentacle/tentacle_server.conf.new
echo "Skipping creation of tentacle_server.conf: there is already one." echo "Skipping creation of tentacle_server.conf: there is already one."

2
pandora_server/pandora_server.redhat.spec
View File

@ -182,6 +182,8 @@ exit 0
%defattr(600,root,root) %defattr(600,root,root)
/etc/pandora/pandora_server.conf.new /etc/pandora/pandora_server.conf.new
%defattr(664,root,root)
/etc/tentacle/tentacle_server.conf.new /etc/tentacle/tentacle_server.conf.new
%defattr(-,pandora,apache,2770) %defattr(-,pandora,apache,2770)

2
pandora_server/pandora_server.spec
View File

@ -201,6 +201,8 @@ rm -Rf /usr/share/man/man1/tentacle_server.1.gz
%defattr(-,pandora,root,750) %defattr(-,pandora,root,750)
/etc/pandora /etc/pandora
%defattr(-,pandora,root,754)
/etc/tentacle /etc/tentacle
%defattr(644,pandora,root) %defattr(644,pandora,root)

2
pandora_server/pandora_server_installer
View File

@ -379,7 +379,7 @@ install () {
else else
echo cp $TENTACLE_CFG_FILE_DIST $DESTDIR$TENTACLE_CFG_FILE echo cp $TENTACLE_CFG_FILE_DIST $DESTDIR$TENTACLE_CFG_FILE
cp $TENTACLE_CFG_FILE_DIST $DESTDIR$TENTACLE_CFG_FILE cp $TENTACLE_CFG_FILE_DIST $DESTDIR$TENTACLE_CFG_FILE
chmod 770 $DESTDIR$TENTACLE_CFG_FILE chmod 774 $DESTDIR$TENTACLE_CFG_FILE
fi fi
echo "Installing Tentacle Server manual" echo "Installing Tentacle Server manual"

7
pandora_server/util/tentacle_serverd
View File

@ -109,13 +109,6 @@ case "$1" in
rc_exit # running start on a service already running rc_exit # running start on a service already running
fi fi
# Try to change the privileges of configuration file
chown $TENTACLE_USER $TENTACLE_CONFIG_FILE > /dev/null 2>&1
if [ $? -ne 0 ]; then
echo "Cannot change the owner of $TENTACLE_CONFIG_FILE configuration file to $TENTACLE_USER user."
rc_exit
fi
# Init the tentacle process # Init the tentacle process
sudo -u $TENTACLE_USER ${TENTACLE_PATH}$TENTACLE_DAEMON $TENTACLE_OPTS sudo -u $TENTACLE_USER ${TENTACLE_PATH}$TENTACLE_DAEMON $TENTACLE_OPTS
sleep 1 sleep 1