Fix a bad reversion in the airtime-playout binary
This commit is contained in:
parent
5e22f929c7
commit
19a1817159
6
install
6
install
|
@ -497,9 +497,9 @@ loud "-----------------------------------------------------"
|
|||
|
||||
loudCmd "apt-get -y --force-yes install rabbitmq-server"
|
||||
|
||||
RABBITMQ_VHOST=$(awk -F ' = ' '{if (! ($0 ~ /^;/) && $0 ~ /^vhost/ ) print $2}' ${AIRTIMEROOT}/airtime_mvc/build/airtime.example.conf)
|
||||
RABBITMQ_USER=$(awk -F ' = ' '{if (! ($0 ~ /^;/) && $0 ~ /^user/ ) print $2}' ${AIRTIMEROOT}/airtime_mvc/build/airtime.example.conf)
|
||||
RABBITMQ_PASSWORD=$(awk -F ' = ' '{if (! ($0 ~ /^;/) && $0 ~ /^password/ ) print $2}' ${AIRTIMEROOT}/airtime_mvc/build/airtime.example.conf)
|
||||
RABBITMQ_VHOST=/airtime
|
||||
RABBITMQ_USER=airtime
|
||||
RABBITMQ_PASSWORD=airtime
|
||||
EXCHANGES="airtime-pypo|pypo-fetch|airtime-media-monitor|media-monitor"
|
||||
|
||||
# Ignore errors in this check to avoid dying when vhost isn't found
|
||||
|
|
|
@ -13,4 +13,4 @@ export PYTHONPATH=/usr/lib/airtime/:/usr/lib/airtime/pypo/bin/:/usr/lib/airtime/
|
|||
export LC_ALL=`cat /etc/default/locale | grep "LANG=" | cut -d= -f2 | tr -d "\n\""`
|
||||
export TERM=xterm
|
||||
|
||||
exec python ${pypo_path}/pypocli.py > /var/log/airtime/pypo/py-interpreter.log 2>&1
|
||||
exec python /usr/lib/airtime/pypo/bin/pypocli.py > /var/log/airtime/pypo/py-interpreter.log 2>&1
|
||||
|
|
24
uninstall
24
uninstall
|
@ -30,6 +30,14 @@ dropAirtimeDatabase() {
|
|||
EOF
|
||||
}
|
||||
|
||||
removeRabbitmqAirtimeSettings() {
|
||||
RMQ_VHOST=$(awk -F ' = ' '{if (! ($0 ~ /^;/) && $0 ~ /^vhost/ ) print $2}' /etc/airtime/airtime.conf)
|
||||
RMQ_USER=$(awk -F ' = ' '{if (! ($0 ~ /^;/) && $0 ~ /^user/ ) print $2}' /etc/airtime/airtime.conf)
|
||||
|
||||
rabbitmqctl delete_vhost ${RMQ_VHOST}
|
||||
rabbitmqctl delete_user ${RMQ_USER}
|
||||
}
|
||||
|
||||
SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
|
||||
AIRTIMEROOT=${SCRIPT_DIR}
|
||||
|
||||
|
@ -61,13 +69,19 @@ if [[ ! ( "$IN" = "y" || "$IN" = "Y" ) ]]; then
|
|||
exit 0
|
||||
fi
|
||||
|
||||
echo -e "\nAre you sure you want to remove your music storage directory ${STOR_DIR} and all of its subdirectories? (Y/n): \c"
|
||||
read IN
|
||||
if [[ "$IN" = "y" || "$IN" = "Y" ]]; then
|
||||
rm -rf ${STOR_DIR}
|
||||
if [ -n ${STOR_DIR} ]; then
|
||||
echo -e "\nAre you sure you want to remove your music storage directory ${STOR_DIR} and all of its subdirectories? (Y/n): \c"
|
||||
read IN
|
||||
if [[ "$IN" = "y" || "$IN" = "Y" ]]; then
|
||||
rm -rf ${STOR_DIR}
|
||||
fi
|
||||
else
|
||||
echo -e "\nNo stor directory found, skipping..."
|
||||
fi
|
||||
|
||||
echo "Uninstalling Airtime..."
|
||||
echo -e "\nUninstalling Airtime..."
|
||||
removeRabbitmqAirtimeSettings
|
||||
|
||||
rm -rf /etc/airtime
|
||||
rm -rf /var/log/airtime/
|
||||
rm -rf /usr/lib/airtime/
|
||||
|
|
Loading…
Reference in New Issue