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

Update paths after wroker move

This commit is contained in:
jo 2021-10-17 02:46:36 +02:00 committed by Kyle Robbertze
parent 58e275147f
commit cf36eec5f8
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/dependabot.yml vendored
View File

@ -38,7 +38,7 @@ updates:
- dependencies - dependencies
- package-ecosystem: "pip" - package-ecosystem: "pip"
directory: "/python_apps/airtime-celery" directory: "/worker"
schedule: schedule:
interval: "daily" interval: "daily"
labels: labels:

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

@ -127,7 +127,7 @@ jobs:
run: | run: |
make -C api lint make -C api lint
make -C analyzer lint make -C analyzer lint
make -C python_apps/airtime-celery lint make -C worker lint
make -C python_apps/api_clients lint make -C python_apps/api_clients lint
make -C python_apps/pypo lint make -C python_apps/pypo lint

10
install
View File

@ -201,7 +201,7 @@ function systemInitInstall() {
alt_path="${target_path//libretime-/airtime_}" alt_path="${target_path//libretime-/airtime_}"
;; ;;
libretime-celery) libretime-celery)
source_path="${python_source_path}/airtime-celery/install/systemd/${service_name}.service" source_path="${SCRIPT_DIR}/worker/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-}"
;; ;;
@ -263,7 +263,7 @@ function systemInitInstall() {
user=${user:-$web_user} user=${user:-$web_user}
;; ;;
libretime-celery) libretime-celery)
source_path="${python_source_path}/airtime-celery/install/upstart/${service_name}.conf" source_path="${SCRIPT_DIR}/worker/install/upstart/${service_name}.conf"
target_path="/etc/init/${service_name}.conf" target_path="/etc/init/${service_name}.conf"
user="" user=""
;; ;;
@ -301,7 +301,7 @@ function systemInitInstall() {
user=${user:-$web_user} user=${user:-$web_user}
;; ;;
libretime-celery) libretime-celery)
source_path="${python_source_path}/airtime-celery/install/sysvinit/${service_name}" source_path="${SCRIPT_DIR}/worker/install/sysvinit/${service_name}"
target_path="/etc/init.d/${service_name}" target_path="/etc/init.d/${service_name}"
source_config_path="${python_source_path}/${service_name}/install/conf/${service_name}" source_config_path="${python_source_path}/${service_name}/install/conf/${service_name}"
target_config_path="/etc/default/${service_name}" target_config_path="/etc/default/${service_name}"
@ -1030,8 +1030,8 @@ systemInitInstall libretime-liquidsoap "$web_user"
systemInitInstall libretime-playout "$web_user" systemInitInstall libretime-playout "$web_user"
verbose "...Done" verbose "...Done"
verbose "\n * Installing airtime-celery..." verbose "\n * Installing celery..."
loudCmd "$pip_cmd install ${AIRTIMEROOT}/python_apps/airtime-celery" loudCmd "$pip_cmd install ${AIRTIMEROOT}/worker"
# Create the Celery user # Create the Celery user
if $is_centos_dist; then if $is_centos_dist; then
loudCmd "id celery 2>/dev/null || adduser --no-create-home -c 'LibreTime Celery' -r celery || true" loudCmd "id celery 2>/dev/null || adduser --no-create-home -c 'LibreTime Celery' -r celery || true"

2
worker/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 := airtime-celery PYLINT_ARG := airtime-celery