Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update paths after playout move

This commit is contained in:
jo 2021-10-17 02:57:09 +02:00 committed by Kyle Robbertze
parent ca12ca5c41
commit 19c816f294
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/dependabot.yml vendored
View File

@ -54,7 +54,7 @@ updates:
- dependencies - dependencies
- package-ecosystem: "pip" - package-ecosystem: "pip"
directory: "/python_apps/pypo" directory: "/playout"
schedule: schedule:
interval: "daily" interval: "daily"
labels: labels:

2
.github/workflows/test.yml vendored
View File

@ -129,7 +129,7 @@ jobs:
make -C analyzer lint make -C analyzer lint
make -C worker lint make -C worker lint
make -C api_client lint make -C api_client lint
make -C python_apps/pypo lint make -C playout lint
test: test:
runs-on: ubuntu-latest runs-on: ubuntu-latest

2
.github/workflows/tools.yml vendored
View File

@ -47,7 +47,7 @@ jobs:
run: | run: |
tools/packages.py --dev --format line ${{ matrix.release }} \ tools/packages.py --dev --format line ${{ matrix.release }} \
analyzer \ analyzer \
python_apps/pypo \ playout \
> packages.list > packages.list
- name: Generate Dockerfile - name: Generate Dockerfile

14
install
View File

@ -206,7 +206,7 @@ function systemInitInstall() {
alt_path="${target_path//libretime-/airtime-}" alt_path="${target_path//libretime-/airtime-}"
;; ;;
libretime-liquidsoap | libretime-playout) libretime-liquidsoap | libretime-playout)
source_path="${python_source_path}/pypo/install/systemd/${service_name}.service" source_path="${SCRIPT_DIR}/playout/install/systemd/${service_name}.service"
target_path="/etc/systemd/system/${service_name}.service" target_path="/etc/systemd/system/${service_name}.service"
alt_path="${target_path//libretime-/airtime-}" alt_path="${target_path//libretime-/airtime-}"
;; ;;
@ -268,7 +268,7 @@ function systemInitInstall() {
user="" user=""
;; ;;
libretime-liquidsoap | libretime-playout) libretime-liquidsoap | libretime-playout)
source_path="${python_source_path}/pypo/install/upstart/${service_name}.conf.template" source_path="${SCRIPT_DIR}/playout/install/upstart/${service_name}.conf.template"
target_path="/etc/init/${service_name}.conf" target_path="/etc/init/${service_name}.conf"
user=${user:-$web_user} user=${user:-$web_user}
;; ;;
@ -308,7 +308,7 @@ function systemInitInstall() {
user="" user=""
;; ;;
libretime-liquidsoap | libretime-playout) libretime-liquidsoap | libretime-playout)
source_path="${python_source_path}/pypo/install/sysvinit/${service_name}" source_path="${SCRIPT_DIR}/playout/install/sysvinit/${service_name}"
target_path="/etc/init.d/${service_name}" target_path="/etc/init.d/${service_name}"
user=${user:-$web_user} user=${user:-$web_user}
;; ;;
@ -760,7 +760,7 @@ if [ "$ignore_dependencies" = "f" ]; then
"${SCRIPT_DIR}/legacy" "${SCRIPT_DIR}/legacy"
"${SCRIPT_DIR}/api" "${SCRIPT_DIR}/api"
"${SCRIPT_DIR}/analyzer" "${SCRIPT_DIR}/analyzer"
"${SCRIPT_DIR}/python_apps/pypo" "${SCRIPT_DIR}/playout"
) )
set -e set -e
@ -1015,15 +1015,15 @@ if [ ! -d /var/log/airtime ]; then
verbose "\n * Copying logrotate files..." verbose "\n * Copying logrotate files..."
loudCmd "cp ${AIRTIMEROOT}/legacy/build/airtime-php.logrotate /etc/logrotate.d/airtime-php" loudCmd "cp ${AIRTIMEROOT}/legacy/build/airtime-php.logrotate /etc/logrotate.d/airtime-php"
loudCmd "cp ${AIRTIMEROOT}/python_apps/pypo/liquidsoap/logrotate.conf /etc/logrotate.d/libretime-liquidsoap" loudCmd "cp ${AIRTIMEROOT}/playout/liquidsoap/logrotate.conf /etc/logrotate.d/libretime-liquidsoap"
fi fi
verbose "\n * Installing API client..." verbose "\n * Installing API client..."
loudCmd "$pip_cmd install ${AIRTIMEROOT}/api_client" loudCmd "$pip_cmd install ${AIRTIMEROOT}/api_client"
verbose "...Done" verbose "...Done"
verbose "\n * Installing pypo and liquidsoap..." verbose "\n * Installing playout and liquidsoap..."
loudCmd "$pip_cmd install ${AIRTIMEROOT}/python_apps/pypo" loudCmd "$pip_cmd install ${AIRTIMEROOT}/playout"
loudCmd "mkdir -p /var/log/airtime/{pypo,pypo-liquidsoap} /var/tmp/airtime/pypo/{cache,files,tmp} /var/tmp/airtime/show-recorder/" loudCmd "mkdir -p /var/log/airtime/{pypo,pypo-liquidsoap} /var/tmp/airtime/pypo/{cache,files,tmp} /var/tmp/airtime/show-recorder/"
loudCmd "chown -R ${web_user}:${web_user} /var/log/airtime/{pypo,pypo-liquidsoap} /var/tmp/airtime/pypo/{cache,files,tmp} /var/tmp/airtime/show-recorder/" loudCmd "chown -R ${web_user}:${web_user} /var/log/airtime/{pypo,pypo-liquidsoap} /var/tmp/airtime/pypo/{cache,files,tmp} /var/tmp/airtime/show-recorder/"
systemInitInstall libretime-liquidsoap "$web_user" systemInitInstall libretime-liquidsoap "$web_user"

2
playout/Makefile
View File

@ -1,6 +1,6 @@
all: lint all: lint
include ../../tools/python.mk include ../tools/python.mk
PIP_INSTALL := --editable . PIP_INSTALL := --editable .
PYLINT_ARG := liquidsoap pypo PYLINT_ARG := liquidsoap pypo