From 407232c7087ceb3cbac908237cfcdbe63dccb436 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 10 Jan 2021 17:23:14 +1300 Subject: [PATCH] Fix for MongoDB package update breaking install script Change to enable use of rcvars for NODE_ENV and PORT --- freebsd/install.sh | 6 +++--- freebsd/rc.d/homebrewery | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/freebsd/install.sh b/freebsd/install.sh index cfb851b9c..0b3bb7fdc 100644 --- a/freebsd/install.sh +++ b/freebsd/install.sh @@ -1,6 +1,6 @@ #!/bin/sh -pkg install -y git nano node npm mongodb44-4.4.1 +pkg install -y git nano node npm mongodb44 sysrc mongod_enable=YES service mongod start @@ -13,8 +13,8 @@ npm install npm audit fix npm run postinstall -cp freebsd/rc.d/homebrewery /etc/rc.d/ -chmod +x /etc/rc.d/homebrewery +cp freebsd/rc.d/homebrewery /usr/local/etc/rc.d/ +chmod +x /usr/local/etc/rc.d/homebrewery sysrc homebrewery_enable=YES service homebrewery start \ No newline at end of file diff --git a/freebsd/rc.d/homebrewery b/freebsd/rc.d/homebrewery index 2d8ea2bfb..20f2bc7e6 100644 --- a/freebsd/rc.d/homebrewery +++ b/freebsd/rc.d/homebrewery @@ -29,6 +29,8 @@ title="HomeBrewery" # Title to display in top/htop load_rc_config $name # Loading rc config vars : ${homebrewery_enable="NO"} # Default: Do not enable HomeBrewery : ${homebrewery_runAs="root"} # Default: Run HomeBrewery as root +: ${homebrewery_port=8000} # Default: Run HomeBrewery on port 8000 +: ${homebrewery_NODE_ENV="local"} # Default: Run HomeBrewery in local mode # Freebsd Setup rcvar=homebrewery_enable # Enables the rc.conf YES/NO flag @@ -36,8 +38,8 @@ pidfile="/var/run/${program_name}.pid" # File that allows the system to keep # Env Setup export HOME=$( getent passwd "homebrewery_runAs" | cut -d: -f6 ) # Gets the home directory of the runAs user -export NODE_ENV="local" -export PORT=8000 +export NODE_ENV=${homebrewery_NODE_ENV} +export PORT=${homebrewery_port} # Command Setup exec_cmd="${location}/${program_name}/server.js" # Path to the HomeBrewery server.js, /usr/local/bin/ when installed globally