From 3d41a66b5191afdf6b01372eecb3e0fa5f75fde9 Mon Sep 17 00:00:00 2001 From: slerena Date: Thu, 24 Dec 2009 10:55:36 +0000 Subject: [PATCH] 2009-12-24 Sancho Lerena * DEBIAN/postinst: Fixed some perms on postinstall. * pandora_console_install: Fixed some perms on postinstall. * pandora_console.spec: Removed one blank space :-)) git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2239 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 8 ++++++++ pandora_console/DEBIAN/postinst | 4 ++-- pandora_console/pandora_console.spec | 2 +- pandora_console/pandora_console_install | 10 ++++++---- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 87b85400dc..31233b08c3 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2009-12-24 Sancho Lerena + + * DEBIAN/postinst: Fixed some perms on postinstall. + + * pandora_console_install: Fixed some perms on postinstall. + + * pandora_console.spec: Removed one blank space :-)) + 2009-12-23 Ramon Novoa * include/functions_db.php: Fixed avg. calculation in custom reports. diff --git a/pandora_console/DEBIAN/postinst b/pandora_console/DEBIAN/postinst index 169dfe78d3..abdf1158f9 100755 --- a/pandora_console/DEBIAN/postinst +++ b/pandora_console/DEBIAN/postinst @@ -5,11 +5,11 @@ #pear install XML_RPC echo Change the user and group to /var/www/pandora_console. -chmod 755 /var/www/pandora_console -R +chmod -R u+rwX,g+rX,g-w,o-rwx /var/www/pandora_console chgrp www-data /var/www/pandora_console -R chown www-data /var/www/pandora_console -R echo Restart the apache. /etc/init.d/apache2 restart -echo "Please, now, point your browser to http://your_IP_address/pandora_console/install.php and follow all the steps described on it." \ No newline at end of file +echo "Please, now, point your browser to http://your_IP_address/pandora_console/install.php and follow all the steps described on it." diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec index 1190afbe58..495132c524 100755 --- a/pandora_console/pandora_console.spec +++ b/pandora_console/pandora_console.spec @@ -23,7 +23,7 @@ Source0: %{name}-%{version}.tar.gz URL: http://www.pandorafms.com Group: Productivity/Networking/Web/Utilities Packager: Manuel Arostegui -Prefix: /srv/www/htdocs +Prefix: /srv/www/htdocs BuildRoot: %{_tmppath}/%{name} BuildArchitectures: noarch AutoReq: 0 diff --git a/pandora_console/pandora_console_install b/pandora_console/pandora_console_install index 4dd6770c71..d1e40ad651 100755 --- a/pandora_console/pandora_console_install +++ b/pandora_console/pandora_console_install @@ -4,7 +4,7 @@ # Linux Version (generic), for SuSe and Debian/Ubuntu only # other Linux distros could not work properly without modifications # Please see http://www.pandorafms.org -# v3.0 Build 090810 +# v3.0 Build 091224 # This code is licensed under GPL 2.0 license. # ********************************************************************** @@ -88,7 +88,8 @@ install () { # Copying Pandora FMS console echo "Copying Pandora FMS Console to $PANDORA_HOME.." cp -R * $PANDORA_HOME - chmod -R 750 $PANDORA_HOME + chmod -R u+rwX,g+rX,g-w,o-rwx $PANDORA_HOME + # Creating 'pandora' user id pandora @@ -108,13 +109,14 @@ install () { then chown -R www-data:root $PANDORA_HOME chown -R pandora:www-data /var/spool/pandora/ - else + else + # Assuming SUSE chown -R wwwrun:root $PANDORA_HOME chown -R pandora:www /var/spool/pandora/ fi echo "Setting secure permissions for Pandora FMS spool dir..." - chmod -R 770 /var/spool/pandora/ + chmod -R u+rwX,g+rwX,o-rwx /var/spool/pandora/ echo "Done." echo " "