More work on monitless installer

This commit is contained in:
Duncan Sommerville 2014-12-16 19:05:17 -05:00
parent 4043ebfd25
commit ad4b61e89f
3 changed files with 8 additions and 3 deletions

View File

@ -319,7 +319,7 @@ loud "\n-----------------------------------------------------"
loud " * Installing Airtime Services * " loud " * Installing Airtime Services * "
loud "-----------------------------------------------------" loud "-----------------------------------------------------"
loudCmd "apt-get -y --force-yes install liquidsoap python python-virtaulenv" loudCmd "apt-get -y --force-yes install liquidsoap python python-virtualenv"
loudCmd "$AIRTIMEROOT/python_apps/python-virtualenv/virtualenv-install.sh" loudCmd "$AIRTIMEROOT/python_apps/python-virtualenv/virtualenv-install.sh"
verbose "\n * Creating /usr/lib/airtime..." verbose "\n * Creating /usr/lib/airtime..."
@ -332,7 +332,11 @@ chmod 755 /run/airtime
chown -R ${web_user}:${web_user} /run/airtime chown -R ${web_user}:${web_user} /run/airtime
verbose "...Done" verbose "...Done"
verbose "\n * Installing API client..." verbose "\n * Cpoying logging files..."
cp -R ${AIRTIMEROOT}/python_apps/std_err_override /usr/lib/airtime/std_err_override
verbose "...Done"
verbose "\n * Cpoying API client files..."
cp -R ${AIRTIMEROOT}/python_apps/api_clients /usr/lib/airtime/api_clients cp -R ${AIRTIMEROOT}/python_apps/api_clients /usr/lib/airtime/api_clients
verbose "...Done" verbose "...Done"

View File

@ -213,6 +213,7 @@ class AirtimeApiClient(object):
try: try:
self.config = ConfigObj(config_path) self.config = ConfigObj(config_path)
self.config.update(api_config) self.config.update(api_config)
self.logger.info(json.dumps(self.config))
self.services = RequestProvider(self.config) self.services = RequestProvider(self.config)
except Exception, e: except Exception, e:
self.logger.error('Error loading config file: %s', config_path) self.logger.error('Error loading config file: %s', config_path)

View File

@ -31,7 +31,7 @@ start () {
#start-stop-daemon --start --quiet --chuid $USERID:$GROUPID \ #start-stop-daemon --start --quiet --chuid $USERID:$GROUPID \
#--pidfile $PIDFILE --nicelevel -15 --startas $DAEMON #--pidfile $PIDFILE --nicelevel -15 --startas $DAEMON
start-stop-daemon --start --quiet --chuid $USERID:$GROUPID \ start-stop-daemon --start --quiet --chuid $USERID:$GROUPID \
--nicelevel -15 --startas $DAEMON --exec $EXEC --startas $DAEMON --exec $EXEC
} }
stop () { stop () {