0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

improve debian/systemd build

Browse source
This commit is contained in:
j 2014-10-11 12:49:00 +02:00
parent 1ae8d051f5
commit 4dc89c9456
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
vm/firstboot.sh
View file

@ -10,7 +10,7 @@ export DEBIAN_FRONTEND=noninteractive
if [ "$ID" == "debian" ]; then if [ "$ID" == "debian" ]; then
SYSTEMD="yes" SYSTEMD="yes"
echo "deb http://ppa.launchpad.net/j/pandora/ubuntu trusty main" > /etc/apt/sources.list.d/j-pandora.list echo "deb http://ppa.launchpad.net/j/pandora/ubuntu trusty main" > /etc/apt/sources.list.d/j-pandora.list
gpg --keyserver subkeys.pgp.net --recv-keys 01975EF3 gpg --keyserver keyserver.ubuntu.com --recv-keys 01975EF3
gpg -a --export 01975EF3 | apt-key add - gpg -a --export 01975EF3 | apt-key add -
else else
SYSTEMD="no" SYSTEMD="no"
@ -141,10 +141,11 @@ $MANAGE collectstatic -l --noinput
if [ "$SYSTEMD" == "yes" ]; then if [ "$SYSTEMD" == "yes" ]; then
cp /srv/pandora/etc/systemd/*.service /lib/systemd/system/ cp /srv/pandora/etc/systemd/*.service /lib/systemd/system/
cp /srv/pandora/etc/tmpfiles.d/*.conf /usr/lib/tmpfiles.d/ cp /srv/pandora/etc/tmpfiles.d/pandora.conf /usr/lib/tmpfiles.d/
if [ "$LXC" == "yes" ]; then if [ "$LXC" == "yes" ]; then
sed -i s/127.0.0.1/0.0.0.0/g /lib/systemd/system/pandora.service sed -i s/127.0.0.1/0.0.0.0/g /lib/systemd/system/pandora.service
fi fi
systemd-tmpfiles --create /usr/lib/tmpfiles.d/pandora.conf >/dev/null || true
for service in pandora pandora-tasks pandora-encoding pandora-cron; do for service in pandora pandora-tasks pandora-encoding pandora-cron; do
systemctl enable ${service}.service systemctl enable ${service}.service
done done