From 683b646adbf4a716f555a33d5dc1c4e50efee563 Mon Sep 17 00:00:00 2001
From: marostegui <noreply@pandorafms.org>
Date: Fri, 22 Dec 2006 09:53:57 +0000
Subject: [PATCH] 2006-12-22  Manuel Arostegui <marostegui@artica.es>

         * pandora_server/specs/fedoracore5/perl-Pandora-1.2.spec: Fixed some
           nonsenses.

         * pandora_server/specs/rhel/perl-Pandora-1.2.spec: Much more polished
           spec file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@333 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_server/ChangeLog                          |  8 ++++++++
 .../specs/fedoracore5/perl-Pandora-1.2.spec       |  9 ++++-----
 pandora_server/specs/rhel/perl-Pandora-1.2.spec   | 15 ++++++++++++++-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 47517e9235..97e3f220f1 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,11 @@
+2006-12-22  Manuel Arostegui <marostegui@artica.es>
+
+	 * pandora_server/specs/fedoracore5/perl-Pandora-1.2.spec: Fixed some
+	   nonsenses.
+	
+	 * pandora_server/specs/rhel/perl-Pandora-1.2.spec: Much more polished
+	   spec file.
+
 2006-12-22  Manuel Arostegui <marostegui@artica.es>
 
 	* pandora_server/specs/fedoracore5/perl-Pandora-1.2.spec: Much more 
diff --git a/pandora_server/specs/fedoracore5/perl-Pandora-1.2.spec b/pandora_server/specs/fedoracore5/perl-Pandora-1.2.spec
index 04bf22055c..07a184c890 100644
--- a/pandora_server/specs/fedoracore5/perl-Pandora-1.2.spec
+++ b/pandora_server/specs/fedoracore5/perl-Pandora-1.2.spec
@@ -32,17 +32,16 @@ make install
 %post
 cp /usr/src/redhat/SOURCES/PandoraFMS_Server-1.2.0.tar.gz /opt
 cd /opt/ && tar -zxvf PandoraFMS_Server-1.2.0.tar.gz
-useradd -m -s /bin/bash pandora
+useradd -m -s /bin/false -d /opt/pandora_server pandora
 chown pandora /opt/pandora_server/data_in
 chown pandora /opt/pandora_server/log
 chown pandora /opt/pandora_server/var
-su pandora -c "mkdir /home/pandora/.ssh"
-su pandora -c "touch /home/pandora/.ssh/authorized_keys"
-su pandora -c "chmod 600 /home/pandora/.ssh/authorized_keys"
+su pandora -c "mkdir /opt/pandora_server/.ssh"
+su pandora -c "touch /opt/pandora_server/.ssh/authorized_keys"
+su pandora -c "chmod 600 /opt/pandora_server/.ssh/authorized_keys"
 /etc/init.d/sshd restart
 clear
 echo "You are required to generate ssh keys by using ssh-keygen. For further information read documentation at: http://pandora.sourceforge.net/en/index.php?sec=docs"
-echo "You HAVE TO give a password to the pandora user which has been created during the installation of this package. Use "passwd pandora"  " 
 echo "Enjoy Pandora. We remind you to point your browser to http://www.openideas.info/phpbb/ if you have any question, idea..."
 echo "Pandora Team"
 
diff --git a/pandora_server/specs/rhel/perl-Pandora-1.2.spec b/pandora_server/specs/rhel/perl-Pandora-1.2.spec
index 5e24a71aed..d92751a9d8 100644
--- a/pandora_server/specs/rhel/perl-Pandora-1.2.spec
+++ b/pandora_server/specs/rhel/perl-Pandora-1.2.spec
@@ -9,7 +9,7 @@ Group: System Development/Languages
 Distribution: RHEL 4 AS
 Source: file://usr/src/redhat/SOURCES/%{TarBall}-%{version}.tar.gz
 Vendor: Sancho Lerena <slerena@gmail.com>
-Packager: Jose Angel de Bustos Perez <jadebustos@linuxmail.org>
+Packager: Jose Angel de Bustos Perez <jadebustos@linuxmail.org>, Manuel Arostegui <marostegui@artica.es>
 BuildRequires: perl make
 Requires: perl perl-DateManip perl-XML-Simple
 
@@ -27,6 +27,19 @@ make install
 %post
 cp /usr/src/redhat/SOURCES/PandoraFMS_Server-1.2.0.tar.gz /opt
 cd /opt/ && tar -zxvf PandoraFMS_Server-1.2.0.tar.gz
+useradd -m -s /bin/false -d /opt/pandora_server pandora
+chown pandora /opt/pandora_server/data_in
+chown pandora /opt/pandora_server/log
+chown pandora /opt/pandora_server/var
+su pandora -c "mkdir /opt/pandora_server/.ssh"
+su pandora -c "touch /opt/pandora_server/.ssh/authorized_keys"
+su pandora -c "chmod 600 /opt/pandora_server/.ssh/authorized_keys"
+/etc/init.d/sshd restart
+clear
+echo "You are required to generate ssh keys by using ssh-keygen. For further information read documentation at: http://pandora.sourceforge.net/en/index.php?sec=docs"
+echo "Enjoy Pandora. We remind you to point your browser to http://www.openideas.info/phpbb/ if you have any question, idea..."
+echo "Pandora Team"
+
 
 %files