summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD9
-rw-r--r--airtime-liquidsoap.service3
3 files changed, 11 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 02468b51e37f..3080f3860c74 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Wed Nov 23 15:18:15 UTC 2016
+# Wed Nov 23 15:30:36 UTC 2016
pkgbase = airtime-git
pkgdesc = Open broadcast software for scheduling and station management.
pkgver = 12396.4940c73
@@ -81,7 +81,7 @@ pkgbase = airtime-git
source = php-errors.patch
md5sums = SKIP
md5sums = f42b444b6b06268a8c8695173b55391c
- md5sums = fc4a319d43a96f0003f348c7ddd8aca2
+ md5sums = 47a2530a9f0b483d9d2bedc4a4430dec
md5sums = 93f750480f7c49d72cdcdb10cd97c089
md5sums = d9c15aaa7b1da14acc99e047f58aac66
md5sums = 6ee878012b7f1bdf6373ce1b7dd8ec5c
diff --git a/PKGBUILD b/PKGBUILD
index dd31b374b05f..d86f3320767a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -86,6 +86,13 @@ msg2 "Replacing python with python2..."
grep -rl '/usr/bin/python' 'python_apps' 'utils' | xargs sed -i "s%/usr/bin/python%/usr/bin/python2%g"
grep -rl 'www-data' . | xargs sed -i "s%www-data%http%g"
+msg2 "Replacing airtime.conf with airtime.ini for ConfigObj compatibility..."
+ cd python_apps
+ grep -rl '/etc/airtime/airtime.conf' | xargs sed -i "s%airtime.conf%airtime.ini%g"
+ cd ../utils
+ sed -i "s%airtime.conf%airtime.ini%g" upgrade.py airtime-import/airtime-import airtime-silan
+ cd ..
+
msg2 "Fixing login web interface aspect ( __tostring exception )..."
patch -Np0 -i ../php-errors.patch
}
@@ -165,7 +172,7 @@ pkgver() {
md5sums=('SKIP'
'f42b444b6b06268a8c8695173b55391c'
- 'fc4a319d43a96f0003f348c7ddd8aca2'
+ '47a2530a9f0b483d9d2bedc4a4430dec'
'93f750480f7c49d72cdcdb10cd97c089'
'd9c15aaa7b1da14acc99e047f58aac66'
'6ee878012b7f1bdf6373ce1b7dd8ec5c'
diff --git a/airtime-liquidsoap.service b/airtime-liquidsoap.service
index 0857eaf3e713..2738bfc30570 100644
--- a/airtime-liquidsoap.service
+++ b/airtime-liquidsoap.service
@@ -4,8 +4,7 @@ After=local-fs.target remote-fs.target network.target
[Service]
Type=simple
-User=http
-Group=http
+User=root
ExecStart=/usr/bin/airtime-liquidsoap
ExecReload=/usr/bin/kill -HUP $MAINPID