From a7e241ade15bee6a83b26403214ea3d4151045d2 Mon Sep 17 00:00:00 2001 From: Rick van der Zwet Date: Mon, 25 May 2020 12:37:08 +0000 Subject: [PATCH] Add FreeBSD support to installer Configuration directory /etc is reserved for system configuration files. /usr/local/etc is reserved for local (user) installed configuation files. --- backend-php/include/inc.php | 1 + install.sh | 25 ++++++++++++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/backend-php/include/inc.php b/backend-php/include/inc.php index 13d2643..366a7c2 100644 --- a/backend-php/include/inc.php +++ b/backend-php/include/inc.php @@ -158,6 +158,7 @@ const DEFAULTS = array( // one found from this list. const CONFIG_PATHS = array( "/etc/hauk/config.php", + "/usr/local/etc/hauk/config.php", __DIR__."/config.php" ); diff --git a/install.sh b/install.sh index 7e170db..c52ab9d 100755 --- a/install.sh +++ b/install.sh @@ -14,11 +14,21 @@ hauk_help() { echo "Installs Hauk to the specified web root directory, e.g. /var/www/html" echo "" echo -e "\033[1mOptions:\033[0m" - echo -e "\033[91m-c\t\033[0mInstall config file to /etc/hauk" + echo -e "\033[91m-c\t\033[0mInstall config file to $config" echo -e "\033[91m-f\t\033[0mOverwrite without asking" exit 1 } +# Centralized configuration +if [ "X$(uname -s)" = "XFreeBSD" ]; then + confdir=/usr/local/etc/hauk + config=/usr/local/etc/hauk/config.php +else + confdir=/etc/hauk + config=/etc/hauk/config.php +fi +useconf=0 + # Print help if no arguments given if [ "$#" -eq 0 ]; then hauk_help @@ -32,11 +42,6 @@ if [ "$webroot" = "-f" ] || [ "$webroot" = "-c" ]; then hauk_help fi -# Centralized configuration -confdir=/etc/hauk -config=/etc/hauk/config.php -useconf=0 - hauk_config() { if [ -f "$config" ]; then if [ "$1" != "-f" ] && [ "$2" != "-f" ]; then @@ -46,7 +51,7 @@ hauk_config() { rm "$config" >/dev/null 2>&1 if [ -f "$config" ]; then echo "You do not have permissions to install the configuration file in" - echo "/etc/hauk. Please run this script as root." + echo "${confdir}. Please run this script as root." exit 5 fi ;; @@ -55,7 +60,7 @@ hauk_config() { rm "$config" >/dev/null 2>&1 if [ -f "$config" ]; then echo "You do not have permissions to install the configuration file in" - echo "/etc/hauk. Please run this script as root." + echo "${confdir}. Please run this script as root." exit 5 fi fi @@ -133,9 +138,7 @@ cp -R backend-php/* "$webroot" cp -R frontend/* "$webroot" # Determine the path in which config is saved -if [ "$useconf" -eq 1 ]; then - confpath=/etc/hauk/config.php -else +if [ "$useconf" -eq 0 ]; then confpath="$webroot/include/config.php" cp backend-php/include/config-sample.php "$confpath" >/dev/null 2>&1 fi