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

2013-04-07 Junichi Satoh <junichi@rworks.jp>

Browse Source 
* pandora_console_install, install.php: Added support for NetBSD.

	Contributed by Hiroki SHIMIZU. Thanks!



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7938 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2013-04-07 06:53:53 +00:00
parent 8698407ad9
commit 4ff737663e
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-04-07 Junichi Satoh <junichi@rworks.jp>
* pandora_console_install, install.php: Added support for NetBSD.
Contributed by Hiroki SHIMIZU. Thanks!
2013-04-05 Miguel de Dios <miguel.dedios@artica.es> 2013-04-05 Miguel de Dios <miguel.dedios@artica.es>
* mobile/operation/agents.php, mobile/operation/tactical.php, * mobile/operation/agents.php, mobile/operation/tactical.php,

3
pandora_console/install.php
View File

@ -498,6 +498,9 @@ function install_step2() {
if (PHP_OS == "FreeBSD") { if (PHP_OS == "FreeBSD") {
$res += check_exists ("/usr/local/bin/twopi","Graphviz Binary"); $res += check_exists ("/usr/local/bin/twopi","Graphviz Binary");
} }
else if (PHP_OS == "NetBSD") {
$res += check_exists ("/usr/pkg/bin/twopi","Graphviz Binary");
}
else { else {
$res += check_exists ("/usr/bin/twopi","Graphviz Binary"); $res += check_exists ("/usr/bin/twopi","Graphviz Binary");
} }

26
pandora_console/pandora_console_install
View File

@ -51,7 +51,12 @@ get_distro () {
then then
LINUX_DISTRO=FreeBSD LINUX_DISTRO=FreeBSD
else else
LINUX_DISTRO=GENERIC if [ "$OS_NAME" = "NetBSD" ]
then
LINUX_DISTRO=NetBSD
else
LINUX_DISTRO=GENERIC
fi
fi fi
OS_VERSION=`uname -r` OS_VERSION=`uname -r`
fi fi
@ -81,7 +86,12 @@ uninstall () {
then 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/apache22/data/pandora_console"
else else
PANDORA_HOME=/srv/www/htdocs/pandora_console if [ "$DISTRO" = "NetBSD" ]
then
PANDORA_HOME="/usr/pkg/share/httpd/htdocs/pandora_console"
else
PANDORA_HOME=/srv/www/htdocs/pandora_console
fi
fi fi
fi fi
fi fi
@ -123,8 +133,14 @@ install () {
fi fi
PANDORA_CONF=$PANDORA_HOME/include/config.php PANDORA_CONF=$PANDORA_HOME/include/config.php
else else
PANDORA_HOME=/srv/www/htdocs/pandora_console if [ "$DISTRO" = "NetBSD" ]
PANDORA_CONF=$PANDORA_HOME/include/config.php then
PANDORA_HOME=/usr/pkg/share/httpd/htdocs/pandora_console
PANDORA_CONF=$PANDORA_HOME/include/config.php
else
PANDORA_HOME=/srv/www/htdocs/pandora_console
PANDORA_CONF=$PANDORA_HOME/include/config.php
fi
fi fi
fi fi
fi fi
@ -190,7 +206,7 @@ install () {
chown -R apache:apache $PANDORA_HOME chown -R apache:apache $PANDORA_HOME
chown -R pandora:apache /var/spool/pandora/ chown -R pandora:apache /var/spool/pandora/
else else
if [ "$DISTRO" = "FreeBSD" ] if [ "$DISTRO" = "FreeBSD" -o "$DISTRO" = "NetBSD" ]
then then
chown -R www:www $PANDORA_HOME chown -R www:www $PANDORA_HOME
chown -R pandora:www /var/spool/pandora/ chown -R pandora:www /var/spool/pandora/