diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog index eaff0e1688..4b256fecf0 100644 --- a/pandora_agents/ChangeLog +++ b/pandora_agents/ChangeLog @@ -1,6 +1,35 @@ +2007-04-11 Manuel Arostegui + + * linux/pandora_agent.conf, pandora_agents.spec: Changed + PATHS to adapt them to the upcoming 1.3 release. + + * bsd-ipso/pandora_agent_daemon, pandora_agent.conf, + pandora_agent.sh: Changed PATHS to adapt them to + the upcoming 1.3 release. + + * aix/pandora_agent_daemon, pandora_agent.conf, + pandora_agent.sh: Changed PATHS to adapt them + to the upcoming 1.3 release. + + * hp-ux/pandora_agent_daemon, pandora_agent.conf, + pandora_agent.sh: Changed PATHS to adapt them + to the upcoming 1.3 release. + + * win32/bin/pandora_agent.conf: Changed PATHS to + adapt them to the upcoming 1.3 release. + + * meta_agent/pandora_agent_sim.sh, pandora_agent_daemon, + pandora_agent_1.conf, pandora_agent_2.conf, pandora_agent_3.conf, + pandora_agent_4.conf, pandora_agent_5.conf: Changed PATHS + to adapt them to the upcoming 1.3 release. + + * solaris/pandora_agent_daemon, pandora_agent.conf, + pandora_agent.sh: Changed PATHS to adapt them to the upcoming + 1.3 release. + 2007-02-02 Manuel Arostegui - linux/pandora_agents.spec: More polished spec file. + * linux/pandora_agents.spec: More polished spec file. 2007-01-08 Manuel Arostegui diff --git a/pandora_agents/aix/pandora_agent.conf b/pandora_agents/aix/pandora_agent.conf index 74e36ee31b..0fe0b1efed 100755 --- a/pandora_agents/aix/pandora_agent.conf +++ b/pandora_agents/aix/pandora_agent.conf @@ -6,12 +6,12 @@ # ================== server_ip 192.168.50.1 -server_path /opt/pandora_server/data_in -pandora_path /opt/pandora_agent -temporal /opt/pandora_agent/data_out -interval 300 -checksum 0 -debug 0 +server_path /usr/share/pandora_server/data_in +pandora_path /usr/share/pandora_agent +temporal /usr/share/pandora_agent/data_out +interval 300 +checksum 0 +debug 0 # Module Definition # ================= diff --git a/pandora_agents/aix/pandora_agent.sh b/pandora_agents/aix/pandora_agent.sh index 88968d1a37..805c6518ad 100755 --- a/pandora_agents/aix/pandora_agent.sh +++ b/pandora_agents/aix/pandora_agent.sh @@ -22,7 +22,7 @@ then echo " " echo "FATAL ERROR: I need an argument to PANDORA AGENT home path" echo " " - echo " example: /opt/pandora_ng/pandora_agent.sh /opt/pandora_ng " + echo " example: /usr/share/pandora_ng/pandora_agent.sh /usr/share/pandora_ng " echo " " exit else diff --git a/pandora_agents/aix/pandora_agent_daemon b/pandora_agents/aix/pandora_agent_daemon index 1002d89148..c12aae4007 100755 --- a/pandora_agents/aix/pandora_agent_daemon +++ b/pandora_agents/aix/pandora_agent_daemon @@ -9,12 +9,12 @@ # DOESNT WORK WHEN MAKES A CALL THAT USE @ CHARACTER # USE DIRECTLY PANDORA AGENT SCRIPT -# for example: pandora_agent.sh /opt/pandora_agent/ & +# for example: pandora_agent.sh /usr/share/pandora_agent/ & exit PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin -PANDORA_PATH=/opt/pandora_agent/ +PANDORA_PATH=/usr/share/pandora_agent/ DAEMON=pandora_agent.sh PIDFILE=/var/locks/pandora_agent.pid diff --git a/pandora_agents/bsd-ipso/pandora_agent.conf b/pandora_agents/bsd-ipso/pandora_agent.conf index bdd4ef0a79..f1f08481a4 100755 --- a/pandora_agents/bsd-ipso/pandora_agent.conf +++ b/pandora_agents/bsd-ipso/pandora_agent.conf @@ -8,9 +8,9 @@ # ================== server_ip pandora_server -server_path /opt/pandora_server/data_in -pandora_path /opt/pandora_agent -temporal /opt/pandora_agent/data_out +server_path /usr/share/pandora_server/data_in +pandora_path /usr/share/pandora_agent +temporal /usr/share/pandora_agent/data_out interval 300 #agent_name bsdbox01 debug 0 diff --git a/pandora_agents/bsd-ipso/pandora_agent.sh b/pandora_agents/bsd-ipso/pandora_agent.sh index 04ff34794a..9253b0b7c3 100755 --- a/pandora_agents/bsd-ipso/pandora_agent.sh +++ b/pandora_agents/bsd-ipso/pandora_agent.sh @@ -22,7 +22,7 @@ then echo " " echo "FATAL ERROR: I need an argument to PANDORA AGENT home path" echo " " - echo " example: /opt/pandora_agent/pandora_agent.sh /opt/pandora_ng " + echo " example: /usr/share/pandora_agent/pandora_agent.sh /usr/share/pandora_ng " echo " " exit else diff --git a/pandora_agents/bsd-ipso/pandora_agent_daemon b/pandora_agents/bsd-ipso/pandora_agent_daemon index 4f4f1a4191..ae131bbed2 100755 --- a/pandora_agents/bsd-ipso/pandora_agent_daemon +++ b/pandora_agents/bsd-ipso/pandora_agent_daemon @@ -4,7 +4,7 @@ # Version para IPSO/BSD (csh) # version 1.1 -set PANDORA_PATH=/opt/pandora_agent +set PANDORA_PATH=/usr/share/pandora_agent set DAEMON=pandora_agent.sh set PIDFILE=/var/run/pandora.pid test -x $PANDORA_PATH/$DAEMON || exit diff --git a/pandora_agents/hp-ux/pandora_agent.conf b/pandora_agents/hp-ux/pandora_agent.conf index cc08cf9658..bd8f6b5362 100644 --- a/pandora_agents/hp-ux/pandora_agent.conf +++ b/pandora_agents/hp-ux/pandora_agent.conf @@ -5,9 +5,9 @@ # General Parameters # ================== server_ip pandora_server -server_path /opt/pandora/data_in -pandora_path /opt/pandora_agent/ -temporal /opt/pandora_agent/data_out +server_path /usr/share/pandora/data_in +pandora_path /usr/share/pandora_agent/ +temporal /usr/share/pandora_agent/data_out interval 300 #agent_name satellite_system checksum 1 diff --git a/pandora_agents/hp-ux/pandora_agent.sh b/pandora_agents/hp-ux/pandora_agent.sh index 3b8f271913..00dee895ad 100644 --- a/pandora_agents/hp-ux/pandora_agent.sh +++ b/pandora_agents/hp-ux/pandora_agent.sh @@ -22,7 +22,7 @@ then echo " " echo "FATAL ERROR: I need an argument to PANDORA AGENT home path" echo " " - echo " example: /opt/pandora_ng/pandora_agent.sh /opt/pandora_ng " + echo " example: /usr/share/pandora_ng/pandora_agent.sh /usr/share/pandora_ng " echo " " exit else diff --git a/pandora_agents/hp-ux/pandora_agent_daemon b/pandora_agents/hp-ux/pandora_agent_daemon index 7e6e7de5e3..d283f5e048 100644 --- a/pandora_agents/hp-ux/pandora_agent_daemon +++ b/pandora_agents/hp-ux/pandora_agent_daemon @@ -5,7 +5,7 @@ # v1.1 PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin -PANDORA_PATH=/opt/pandora_agent/ +PANDORA_PATH=/usr/share/pandora_agent/ DAEMON=pandora_agent.sh PIDFILE=/var/run/pandora_agent.pid diff --git a/pandora_agents/linux/pandora_agent.conf b/pandora_agents/linux/pandora_agent.conf index 94c68dbcf4..263d2d1fe7 100755 --- a/pandora_agents/linux/pandora_agent.conf +++ b/pandora_agents/linux/pandora_agent.conf @@ -8,7 +8,7 @@ # ================== server_ip 192.168.50.1 -server_path /opt/pandora_server/data_in +server_path /usr/share/pandora_server/data_in temporal /var/spool/pandora/data_out logfile /var/log/pandora_agent.log diff --git a/pandora_agents/linux/pandora_agents.spec b/pandora_agents/linux/pandora_agents.spec index 630b636eb9..19a77a5965 100755 --- a/pandora_agents/linux/pandora_agents.spec +++ b/pandora_agents/linux/pandora_agents.spec @@ -13,7 +13,7 @@ Source0: %{name}-%{version}.tar.gz URL: http://pandora.sf.net Group: System/Monitoring Packager: Manuel Arostegui -Prefix: /opt +Prefix: /usr/share BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot BuildArchitectures: noarch Requires: coreutils @@ -61,8 +61,8 @@ rm -rf $RPM_BUILD_ROOT echo "Pandora Agent has been place under /usr/bin/" echo "Pandora Agent configuration file is /etc/pandora/pandora_agent.conf" mkdir -p /etc/pandora -ln -s /opt/pandora_agent/pandora_agent.conf /etc/pandora/pandora_agent.conf -ln -s /opt/pandora_agent/pandora_user.conf /etc/pandora/pandora_user.conf +ln -s /usr/share/pandora_agent/pandora_agent.conf /etc/pandora/pandora_agent.conf +ln -s /usr/share/pandora_agent/pandora_user.conf /etc/pandora/pandora_user.conf %files %defattr(700,pandora,pandora) /usr/bin/pandora_agent_daemon diff --git a/pandora_agents/meta_agent/pandora_agent_1.conf b/pandora_agents/meta_agent/pandora_agent_1.conf index 6cc1c40525..c0c65bc292 100755 --- a/pandora_agents/meta_agent/pandora_agent_1.conf +++ b/pandora_agents/meta_agent/pandora_agent_1.conf @@ -7,9 +7,9 @@ # ================== server_ip 192.168.5.2 -server_path /opt/pandora_server/data_in -pandora_path /opt/pandora_agent_sim/ -temporal /opt/pandora_agent_sim/data_out +server_path /usr/share/pandora_server/data_in +pandora_path /usr/share/pandora_agent_sim/ +temporal /usr/share/pandora_agent_sim/data_out interval 300 agent_name lxfirewall agent_os Linux diff --git a/pandora_agents/meta_agent/pandora_agent_2.conf b/pandora_agents/meta_agent/pandora_agent_2.conf index ccf04d5d24..5ff7ec3fe4 100755 --- a/pandora_agents/meta_agent/pandora_agent_2.conf +++ b/pandora_agents/meta_agent/pandora_agent_2.conf @@ -7,9 +7,9 @@ # ================== server_ip 192.168.5.2 -server_path /opt/pandora_server/data_in -pandora_path /opt/pandora_agent_sim/ -temporal /opt/pandora_agent_sim/data_out +server_path /usr/share/pandora_server/data_in +pandora_path /usr/share/pandora_agent_sim/ +temporal /usr/share/pandora_agent_sim/data_out interval 300 agent_name netalive01 diff --git a/pandora_agents/meta_agent/pandora_agent_3.conf b/pandora_agents/meta_agent/pandora_agent_3.conf index 1c55eeb4de..571254f022 100755 --- a/pandora_agents/meta_agent/pandora_agent_3.conf +++ b/pandora_agents/meta_agent/pandora_agent_3.conf @@ -10,9 +10,9 @@ # ================== server_ip 192.168.5.2 -server_path /opt/pandora_server/data_in -pandora_path /opt/pandora_agent_sim/ -temporal /opt/pandora_agent_sim/data_out +server_path /usr/share/pandora_server/data_in +pandora_path /usr/share/pandora_agent_sim/ +temporal /usr/share/pandora_agent_sim/data_out interval 300 agent_name router agent_os 3COM diff --git a/pandora_agents/meta_agent/pandora_agent_4.conf b/pandora_agents/meta_agent/pandora_agent_4.conf index b20dd628bd..6142c50c88 100755 --- a/pandora_agents/meta_agent/pandora_agent_4.conf +++ b/pandora_agents/meta_agent/pandora_agent_4.conf @@ -7,9 +7,9 @@ # ================== server_ip 192.168.5.2 -server_path /opt/pandora_server/data_in -pandora_path /opt/pandora_agent_sim/ -temporal /opt/pandora_agent_sim/data_out +server_path /usr/share/pandora_server/data_in +pandora_path /usr/share/pandora_agent_sim/ +temporal /usr/share/pandora_agent_sim/data_out interval 300 agent_name serv_r2 agent_os FreeBSD diff --git a/pandora_agents/meta_agent/pandora_agent_5.conf b/pandora_agents/meta_agent/pandora_agent_5.conf index 96f3647ef1..8df166b17c 100755 --- a/pandora_agents/meta_agent/pandora_agent_5.conf +++ b/pandora_agents/meta_agent/pandora_agent_5.conf @@ -7,9 +7,9 @@ # ================== server_ip 192.168.5.2 -server_path /opt/pandora_server/data_in -pandora_path /opt/pandora_agent_sim/ -temporal /opt/pandora_agent_sim/data_out +server_path /usr/share/pandora_server/data_in +pandora_path /usr/share/pandora_agent_sim/ +temporal /usr/share/pandora_agent_sim/data_out interval 300 agent_name testbox01 agent_os Linux diff --git a/pandora_agents/meta_agent/pandora_agent_daemon b/pandora_agents/meta_agent/pandora_agent_daemon index 6447c13dd7..cab30d1f62 100755 --- a/pandora_agents/meta_agent/pandora_agent_daemon +++ b/pandora_agents/meta_agent/pandora_agent_daemon @@ -5,7 +5,7 @@ # v1.0.3 PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin -PANDORA_PATH=/opt/pandora_agent_sim +PANDORA_PATH=/usr/share/pandora_agent_sim DAEMON=pandora_agent_sim.sh PIDFILE=/var/run/pandora_sim.pid test -x $PANDORA_PATH/$DAEMON || exit diff --git a/pandora_agents/meta_agent/pandora_agent_sim.sh b/pandora_agents/meta_agent/pandora_agent_sim.sh index dcb3772586..9655af1f23 100755 --- a/pandora_agents/meta_agent/pandora_agent_sim.sh +++ b/pandora_agents/meta_agent/pandora_agent_sim.sh @@ -18,7 +18,7 @@ then echo " " echo "FATAL ERROR: I need an argument to PANDORA AGENT home path" echo " " - echo " example: /opt/pandora_ng/pandora_agent_sim.sh /opt/pandora_ng " + echo " example: /usr/share/pandora_ng/pandora_agent_sim.sh /usr/share/pandora_ng " echo " " exit -1 else diff --git a/pandora_agents/solaris/pandora_agent.conf b/pandora_agents/solaris/pandora_agent.conf index 875f013d4d..713cbcbd91 100755 --- a/pandora_agents/solaris/pandora_agent.conf +++ b/pandora_agents/solaris/pandora_agent.conf @@ -5,9 +5,9 @@ # General Parameters # ================== server_ip 192.168.50.100 -server_path /opt/pandora_server/data_in -pandora_path /opt/pandora_agent/ -temporal /opt/pandora_agent/data_out +server_path /usr/share/pandora_server/data_in +pandora_path /usr/share/pandora_agent/ +temporal /usr/share/pandora_agent/data_out interval 300 #agent_name satellite_system checksum 0 diff --git a/pandora_agents/solaris/pandora_agent.sh b/pandora_agents/solaris/pandora_agent.sh index 46087dd23e..05a44e5aee 100755 --- a/pandora_agents/solaris/pandora_agent.sh +++ b/pandora_agents/solaris/pandora_agent.sh @@ -22,7 +22,7 @@ then echo " " echo "FATAL ERROR: I need an argument to PANDORA AGENT home path" echo " " - echo " example: /opt/pandora_ng/pandora_agent.sh /opt/pandora_ng " + echo " example: /usr/share/pandora_ng/pandora_agent.sh /usr/share/pandora_ng " echo " " exit else diff --git a/pandora_agents/solaris/pandora_agent_daemon b/pandora_agents/solaris/pandora_agent_daemon index 7c6b173c65..5b9a1f5260 100755 --- a/pandora_agents/solaris/pandora_agent_daemon +++ b/pandora_agents/solaris/pandora_agent_daemon @@ -6,7 +6,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin -PANDORA_PATH=/opt/pandora_agent/ +PANDORA_PATH=/usr/share/pandora_agent/ DAEMON=pandora_agent.sh PIDFILE=/var/run/pandora_agent.pid diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf index 3564d42f9f..adc989386f 100644 --- a/pandora_agents/win32/bin/pandora_agent.conf +++ b/pandora_agents/win32/bin/pandora_agent.conf @@ -14,7 +14,7 @@ # ================== server_ip 192.168.50.100 -server_path /opt/pandora_server/data_in +server_path /usr/share/pandora_server/data_in temporal "C:\windows\temp" interval 300 agent_name caprica diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 6d67d37c07..0f1c3ea39f 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,12 @@ +2007-04-11 Manuel Arostegui + + * pandora_network, pandora_snmpconsole, pandora_server + pandora_recon: Changed PATHS to adapt them to the + upcoming 1.3 release. + + * specs/fedoracore5/pandora_server.spec: Changed + PATHS to adapt them to the upcoming 1.3 release. + 2007-03-29 Sancho Lerena * pandora_config.pm: Now stores $pa_config->{'server_id'} diff --git a/pandora_server/pandora_network b/pandora_server/pandora_network index 6834a3fdd6..46b321cce5 100755 --- a/pandora_server/pandora_network +++ b/pandora_server/pandora_network @@ -5,7 +5,7 @@ # v1.2 (Ene/2006) # Configurable path and filenames -PANDORA_HOME="/opt/pandora_server" +PANDORA_HOME="/usr/share/pandora_server" PANDORA_NETWORK_PID="$PANDORA_HOME/var/pandora_network.pid" # Main script diff --git a/pandora_server/pandora_recon b/pandora_server/pandora_recon index 17755a4561..55b2c22990 100755 --- a/pandora_server/pandora_recon +++ b/pandora_server/pandora_recon @@ -5,7 +5,7 @@ # v1.3 (Mar/2007) # Configurable path and filenames -PANDORA_HOME="/opt/pandora_server" +PANDORA_HOME="/usr/share/pandora_server" PANDORA_PID="$PANDORA_HOME/var/pandora_recon.pid" # Main script diff --git a/pandora_server/pandora_server b/pandora_server/pandora_server index 3e01fb1be0..cfb2b23f18 100755 --- a/pandora_server/pandora_server +++ b/pandora_server/pandora_server @@ -5,7 +5,7 @@ # v1.2 (Ene/2006) # Configurable path and filenames -PANDORA_HOME="/opt/pandora_server" +PANDORA_HOME="/usr/share/pandora_server" PANDORA_SERVER_PID="$PANDORA_HOME/var/pandora_server.pid" # Main script diff --git a/pandora_server/pandora_snmpconsole b/pandora_server/pandora_snmpconsole index 4967e1521d..9454f3caa5 100755 --- a/pandora_server/pandora_snmpconsole +++ b/pandora_server/pandora_snmpconsole @@ -7,7 +7,7 @@ # Compatible with NetSNMP 5.1 or higher # Configurable path and filenames -PANDORA_HOME="/opt/pandora_server" +PANDORA_HOME="/usr/share/pandora_server" DAEMON_PATH="$PANDORA_HOME/util" DAEMON_LOG="$PANDORA_HOME/log/snmptrapd.log" DAEMON_PID="$PANDORA_HOME/var/snmptrapd.pid" diff --git a/pandora_server/specs/fedoracore5/pandora_server.spec b/pandora_server/specs/fedoracore5/pandora_server.spec index ea709c4514..b3745e6343 100755 --- a/pandora_server/specs/fedoracore5/pandora_server.spec +++ b/pandora_server/specs/fedoracore5/pandora_server.spec @@ -13,7 +13,7 @@ Source0: %{name}-%{version}.tar.gz URL: http://pandora.sf.net Group: System/Monitoring Packager: Manuel Arostegui -Prefix: /opt +Prefix: /usr/share BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot BuildArchitectures: noarch Requires: openssh-server net-snmp perl-XML-Simple perl-DBI perl-TimeDate perl-DateManip perl-Net-Ping perl-Net-Ping-External perl-IO-Socket-SSL @@ -46,8 +46,8 @@ mkdir -p $RPM_BUILD_ROOT/usr/local/ mkdir -p $RPM_BUILD_ROOT/var/spool/pandora/ mkdir -p $RPM_BUILD_ROOT/var/spool/pandora/data_in mkdir -p $RPM_BUILD_ROOT/var/log/pandora/ -mkdir -p $RPM_BUILD_ROOT/usr/share/pandora/ -mkdir -p $RPM_BUILD_ROOT/usr/share/pandora/conf/ +mkdir -p $RPM_BUILD_ROOT/usr/share/pandora_server/ +mkdir -p $RPM_BUILD_ROOT/usr/share/pandora_server/conf/ mkdir -p $RPM_BUILD_ROOT/usr/lib/ mkdir -p $RPM_BUILD_ROOT/usr/lib/perl5 mkdir -p $RPM_BUILD_ROOT/usr/lib/perl5/site_perl/ @@ -57,14 +57,14 @@ cp -aRf * $RPM_BUILD_ROOT%{prefix}/%{name}-%{version}-%{release} mv $RPM_BUILD_ROOT%{prefix}/%{name}-%{version}-%{release}/bin/pandora_server.pl $RPM_BUILD_ROOT/usr/bin/pandora_server mv $RPM_BUILD_ROOT%{prefix}/%{name}-%{version}-%{release}/bin/pandora_network.pl $RPM_BUILD_ROOT/usr/bin/pandora_network mv $RPM_BUILD_ROOT%{prefix}/%{name}-%{version}-%{release}/bin/pandora_snmpconsole.pl $RPM_BUILD_ROOT/usr/bin/pandora_snmpconsole -mv $RPM_BUILD_ROOT%{prefix}/%{name}-%{version}-%{release}/conf/pandora_server.conf $RPM_BUILD_ROOT/usr/share/pandora/conf/pandora_server.conf +mv $RPM_BUILD_ROOT%{prefix}/%{name}-%{version}-%{release}/conf/pandora_server.conf $RPM_BUILD_ROOT/usr/share/pandora_server/conf/pandora_server.conf mv $RPM_BUILD_ROOT%{prefix}/%{name}-%{version}-%{release}/util/ $RPM_BUILD_ROOT/usr/share/pandora/ -mv $RPM_BUILD_ROOT%{prefix}/%{name}-%{version}-%{release}/bin/pandora_config.pm $RPM_BUILD_ROOT/usr/share/pandora/util/ -mv $RPM_BUILD_ROOT%{prefix}/%{name}-%{version}-%{release}/bin/pandora_db.pm $RPM_BUILD_ROOT/usr/share/pandora/util/ -mv $RPM_BUILD_ROOT%{prefix}/%{name}-%{version}-%{release}/bin/pandora_tools.pm $RPM_BUILD_ROOT/usr/share/pandora/util/ -cp $RPM_BUILD_ROOT/usr/share/pandora/util/pandora_config.pm $RPM_BUILD_ROOT/usr/lib/perl5/site_perl/5.8.5/ -cp $RPM_BUILD_ROOT/usr/share/pandora/util/pandora_db.pm $RPM_BUILD_ROOT/usr/lib/perl5/site_perl/5.8.5/ -cp $RPM_BUILD_ROOT/usr/share/pandora/util/pandora_tools.pm $RPM_BUILD_ROOT/usr/lib/perl5/site_perl/5.8.5/ +mv $RPM_BUILD_ROOT%{prefix}/%{name}-%{version}-%{release}/bin/pandora_config.pm $RPM_BUILD_ROOT/usr/share/pandora_server/util/ +mv $RPM_BUILD_ROOT%{prefix}/%{name}-%{version}-%{release}/bin/pandora_db.pm $RPM_BUILD_ROOT/usr/share/pandora_server/util/ +mv $RPM_BUILD_ROOT%{prefix}/%{name}-%{version}-%{release}/bin/pandora_tools.pm $RPM_BUILD_ROOT/usr/share/pandora_server/util/ +cp $RPM_BUILD_ROOT/usr/share/pandora_server/util/pandora_config.pm $RPM_BUILD_ROOT/usr/lib/perl5/site_perl/5.8.5/ +cp $RPM_BUILD_ROOT/usr/share/pandora_server/util/pandora_db.pm $RPM_BUILD_ROOT/usr/lib/perl5/site_perl/5.8.5/ +cp $RPM_BUILD_ROOT/usr/share/pandora_server/util/pandora_tools.pm $RPM_BUILD_ROOT/usr/lib/perl5/site_perl/5.8.5/ cp pandora.1 $RPM_BUILD_ROOT/usr/share/man/man1/ @@ -83,15 +83,15 @@ if [ "$1" = "0" ]; then fi mkdir -p /etc/pandora mkdir -p /etc/pandora/conf/ -ln -s /usr/share/pandora/conf/pandora_server.conf /etc/pandora/conf/pandora_server.conf +ln -s /usr/share/pandora_server/conf/pandora_server.conf /etc/pandora/conf/pandora_server.conf -mkdir -p /opt/pandora_server/ -mkdir -p /opt/pandora_server/log/ -mkdir -p /opt/pandora_server/data_in +mkdir -p /usr/share/pandora_server/ +mkdir -p /usr/share/pandora_server/log/ +mkdir -p /usr/share/pandora_server/data_in echo "Pandora Server binarys has been placed under /usr/bin/" echo "Pandora Server configuration is /etc/pandora/conf" -echo "Pandora Server data has been placed under /var/spool/data_in/" +echo "Pandora Server data has been placed under /var/spool/pandora/data_in/" echo "Pandora Server logs has benn placed under /var/log/pandora" echo "For further information please: man pandora or man pandora_server" %files @@ -102,12 +102,12 @@ echo "For further information please: man pandora or man pandora_server" /var/spool/pandora/ %defattr(755,pandora,pandora) #/etc/pandora/conf/pandora_server.conf -/usr/share/pandora/util/pandora_config.pm -/usr/share/pandora/util/pandora_db.pm -/usr/share/pandora/util/pandora_tools.pm -/usr/share/pandora/util/pandora_db.pl -/usr/share/pandora/util/pandora_dbstress.pl -/usr/share/pandora/util/snmptrapd +/usr/share/pandora_server/util/pandora_config.pm +/usr/share/pandora_server/util/pandora_db.pm +/usr/share/pandora_server/util/pandora_tools.pm +/usr/share/pandora_server/util/pandora_db.pl +/usr/share/pandora_server/util/pandora_dbstress.pl +/usr/share/pandora_server/util/snmptrapd /usr/lib/perl5/site_perl/5.8.5/pandora_config.pm /usr/lib/perl5/site_perl/5.8.5/pandora_db.pm /usr/lib/perl5/site_perl/5.8.5/pandora_tools.pm