From 6540a34a9ba2b92250bb221a033c99f32d23c5b4 Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Tue, 19 May 2020 10:16:31 -0400 Subject: [PATCH] Adding back scripts in /docs --- .../application/configs/config-check.php | 46 +++---- .../views/scripts/systemstatus/index.phtml | 28 ++--- .../airtime-setup/forms/finish-settings.php | 16 +-- .../airtime-setup/forms/general-settings.php | 19 +++ .../airtime-setup/forms/rabbitmq-settings.php | 4 +- airtime_mvc/build/airtime-setup/load.php | 12 +- .../build/airtime-setup/setup-config.php | 2 +- .../locale/ru_RU/LC_MESSAGES/airtime.po | 20 +-- .../public/css/images/libretime_logo_jp.png | Bin 0 -> 9898 bytes airtime_mvc/public/js/setup/setup-config.js | 11 ++ airtime_mvc/public/setup/general-setup.php | 58 ++++++++- docs/manual/reverse-proxy/index.md | 117 ++++++++++++++++++ docs/scripts/install.sh | 8 ++ docs/scripts/serve.sh | 10 ++ install | 67 +++++++--- .../{airtime-celery => libretime-celery} | 0 .../install/systemd/libretime-celery.service | 0 ...time-celery.conf => libretime-celery.conf} | 0 .../systemd/libretime-analyzer.service | 4 +- .../{airtime_analyzer => libretime-analyzer} | 0 ..._analyzer.conf => libretime-analyzer.conf} | 0 .../systemd/libretime-liquidsoap.service | 2 +- .../install/systemd/libretime-playout.service | 2 +- ...irtime-liquidsoap => libretime-liquidsoap} | 0 .../{airtime-playout => libretime-playout} | 0 travis/python.sh | 4 - 26 files changed, 336 insertions(+), 94 deletions(-) create mode 100644 airtime_mvc/public/css/images/libretime_logo_jp.png create mode 100644 docs/manual/reverse-proxy/index.md create mode 100644 docs/scripts/install.sh create mode 100644 docs/scripts/serve.sh rename python_apps/airtime-celery/install/initd/{airtime-celery => libretime-celery} (100%) rename installer/systemd/airtime-celery.service => python_apps/airtime-celery/install/systemd/libretime-celery.service (100%) rename python_apps/airtime-celery/install/upstart/{airtime-celery.conf => libretime-celery.conf} (100%) rename installer/systemd/airtime_analyzer.service => python_apps/airtime_analyzer/install/systemd/libretime-analyzer.service (75%) rename python_apps/airtime_analyzer/install/sysvinit/{airtime_analyzer => libretime-analyzer} (100%) rename python_apps/airtime_analyzer/install/upstart/{airtime_analyzer.conf => libretime-analyzer.conf} (100%) rename installer/systemd/airtime-liquidsoap.service => python_apps/pypo/install/systemd/libretime-liquidsoap.service (79%) rename installer/systemd/airtime-playout.service => python_apps/pypo/install/systemd/libretime-playout.service (82%) rename python_apps/pypo/install/sysvinit/{airtime-liquidsoap => libretime-liquidsoap} (100%) rename python_apps/pypo/install/sysvinit/{airtime-playout => libretime-playout} (100%) diff --git a/airtime_mvc/application/configs/config-check.php b/airtime_mvc/application/configs/config-check.php index 4c9857b62..6a99a2acd 100644 --- a/airtime_mvc/application/configs/config-check.php +++ b/airtime_mvc/application/configs/config-check.php @@ -165,19 +165,19 @@ $result = $r1 && $r2; - Airtime Analyzer + Media Analyzer - Airtime Upload and File Analysis service + "> - Check that the airtime_analyzer service is installed correctly in /etc/init.d, - and ensure that it's running with -
initctl list | grep airtime_analyzer
- If not, try running sudo service airtime_analyzer start + /etc/systemd/system/, + +
systemctl status libretime-analyzer
+
sudo systemctl restart libretime-analyzer @@ -188,16 +188,16 @@ $result = $r1 && $r2; Pypo - Airtime playout service + "> - Check that the airtime-playout service is installed correctly in /etc/init.d, - and ensure that it's running with -
initctl list | grep airtime-playout
- If not, try running sudo service airtime-playout restart + /etc/systemd/system/, + +
systemctl status libretime-playout
+
sudo systemctl restart libretime-playout @@ -208,16 +208,16 @@ $result = $r1 && $r2; Liquidsoap - Airtime liquidsoap service + - + "> - Check that the airtime-liquidsoap service is installed correctly in /etc/init.d, - and ensure that it's running with -
initctl list | grep airtime-liquidsoap
- If not, try running sudo service airtime-liquidsoap restart + /etc/systemd/system/, + +
systemctl status libretime-liquidsoap
+
sudo systemctl restart libretime-liquidsoap @@ -228,16 +228,16 @@ $result = $r1 && $r2; Celery - Airtime Celery Task service + - + "> - Check that the airtime-celery service is installed correctly in /etc/init.d, - and ensure that it's running with -
initctl list | grep airtime-celery
- If not, try running sudo service airtime-celery restart + /etc/systemd/system/, + +
systemctl status libretime-celery
+
sudo systemctl restart libretime-celery diff --git a/airtime_mvc/application/views/scripts/systemstatus/index.phtml b/airtime_mvc/application/views/scripts/systemstatus/index.phtml index 869351370..41910a2bf 100644 --- a/airtime_mvc/application/views/scripts/systemstatus/index.phtml +++ b/airtime_mvc/application/views/scripts/systemstatus/index.phtml @@ -44,7 +44,7 @@ "> - Try running sudo apt-get install php5-pgsql + Try running sudo apt-get install php7-pgsql @@ -101,10 +101,10 @@ "> - /etc/init, + /etc/systemd/system/, -
initctl list | grep airtime_analyzer
-
sudo service airtime_analyzer start +
systemctl status libretime-analyzer
+
sudo systemctl restart libretime-analyzer @@ -121,10 +121,10 @@ "> - /etc/init, + /etc/systemd/system/, -
initctl list | grep airtime-playout
-
sudo service airtime-playout restart +
systemctl status libretime-playout
+
sudo systemctl restart libretime-playout @@ -141,17 +141,17 @@ "> - /etc/init, + /etc/systemd/system/, -
initctl list | grep airtime-liquidsoap
-
sudo service airtime-liquidsoap restart +
systemctl status libretime-liquidsoap
+
sudo systemctl restart libretime-liquidsoap - + Celery @@ -161,10 +161,10 @@ "> - /etc/init, + /etc/systemd/system/, -
initctl list | grep airtime-celery
-
sudo service airtime-celery restart +
systemctl status libretime-celery
+
sudo systemctl restart libretime-celery diff --git a/airtime_mvc/build/airtime-setup/forms/finish-settings.php b/airtime_mvc/build/airtime-setup/forms/finish-settings.php index e08afe4fc..677b2d473 100644 --- a/airtime_mvc/build/airtime-setup/forms/finish-settings.php +++ b/airtime_mvc/build/airtime-setup/forms/finish-settings.php @@ -2,18 +2,18 @@ ?>
-

Manual Step: Start Airtime Services

+

Manual Step: Start Libretime Services

Looks like you're almost done! As a final step, please run the following commands from the terminal:

- 
sudo service airtime-playout start
-sudo service airtime-liquidsoap start
-sudo service airtime_analyzer start
-sudo service airtime-celery start
+ 
sudo systemctl start libretime-playout
+sudo systemctl start libretime-liquidsoap
+sudo systemctl start libretime-analyzer
+sudo systemctl start libretime-celery

- Click "Done!" to bring up the Airtime configuration checklist; if your configuration is all green, - you're ready to get started with your personal Airtime station! + Click "Done!" to bring up the Libretime configuration checklist; if your configuration is all green, + you're ready to get started with your personal Libretime station!

If you need to re-run the web installer, just remove /etc/airtime/airtime.conf. @@ -28,4 +28,4 @@ sudo service airtime-celery start e.preventDefault(); window.location.assign("/?config"); }); - \ No newline at end of file + diff --git a/airtime_mvc/build/airtime-setup/forms/general-settings.php b/airtime_mvc/build/airtime-setup/forms/general-settings.php index f15e06d5a..50426a543 100644 --- a/airtime_mvc/build/airtime-setup/forms/general-settings.php +++ b/airtime_mvc/build/airtime-setup/forms/general-settings.php @@ -19,6 +19,21 @@ +

The CORS URL can be setup during install if you are accessing your LibreTime instance behind a Proxy. + This is common with docker setups. If you have a reverse proxy setup enter the URL below, otherwise you + can safely ignore this. Please enter one URL per line. Include the entire URL such as http://example.com + If you are reinstalling LibreTime on an existing setup you can ignore this as well, + the settings in your existing database will be retained unless you enter new values below. +

+
+ CORS URL
+
+
+
+ + +
+
@@ -27,6 +42,10 @@