tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2014-06-08 Junichi Satoh <junichi@rworks.jp> 

* pandora_console_install: Added support for apache24 with FreeBSD.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10138 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2014-06-08 00:06:41 +00:00
parent 3d7ef520b2
commit c8bcaee7d8
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/ChangeLog
View File

@ -1,3 +1,7 @@
2014-06-08 Junichi Satoh <junichi@rworks.jp>
* pandora_console_install: Added support for apache24 with FreeBSD.
2014-06-06 Alejandro Gallardo <alejandro.gallardo@artica.es>
* operation/agentes/estado_generalagente.php: Added the

13
pandora_console/pandora_console_install
View File

@ -84,7 +84,7 @@ uninstall () {
else
if [ "$DISTRO" = "FreeBSD" ]
then
PANDORA_HOME="/usr/local/www/data/pandora_console /usr/local/www/apache22/data/pandora_console"
PANDORA_HOME="/usr/local/www/data/pandora_console /usr/local/www/apache24/data/pandora_console /usr/local/www/apache22/data/pandora_console"
else
if [ "$DISTRO" = "NetBSD" ]
then
@ -125,11 +125,16 @@ install () {
else
if [ "$DISTRO" = "FreeBSD" ]
then
if [ -d /usr/local/www/apache22 ]
if [ -d /usr/local/www/apache24 ]
then
PANDORA_HOME=/usr/local/www/apache22/data/pandora_console
PANDORA_HOME=/usr/local/www/apache24/data/pandora_console
else
PANDORA_HOME=/usr/local/www/data/pandora_console
if [ -d /usr/local/www/apache22 ]
then
PANDORA_HOME=/usr/local/www/apache22/data/pandora_console
else
PANDORA_HOME=/usr/local/www/data/pandora_console
fi
fi
PANDORA_CONF=$PANDORA_HOME/include/config.php
else