From 5e493051eb3673465da022ea6d763a1f76ded1b7 Mon Sep 17 00:00:00 2001 From: Michael Wagner Date: Tue, 25 Feb 2020 03:22:27 +0100 Subject: [PATCH] epic-ukulele --- TestXfhem/FitnessePages/AaaPrepare/content.txt | 4 ++++ TestXfhem/FitnessePages/TestWatchdog/content.txt | 4 ++-- TestXfhem/bin/install-sysal-stub | 5 ++++- TestXfhem/bin/sysal-stub.pl | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/TestXfhem/FitnessePages/AaaPrepare/content.txt b/TestXfhem/FitnessePages/AaaPrepare/content.txt index 5fa4f14..b75ee2f 100644 --- a/TestXfhem/FitnessePages/AaaPrepare/content.txt +++ b/TestXfhem/FitnessePages/AaaPrepare/content.txt @@ -2,3 +2,7 @@ Sysal-Stub installieren !|test.util.CallScript| |call script|sudo bin/install-sysal-stub| + +Anmerkung: Falls eine komplett neue Installation des sysal-stub erzwungen werden soll: +sudo rm /etc/apache2/sites-available/sysal_stub.conf +ausführen. diff --git a/TestXfhem/FitnessePages/TestWatchdog/content.txt b/TestXfhem/FitnessePages/TestWatchdog/content.txt index 564c8c3..8b3a0b9 100644 --- a/TestXfhem/FitnessePages/TestWatchdog/content.txt +++ b/TestXfhem/FitnessePages/TestWatchdog/content.txt @@ -4,7 +4,7 @@ Install Watchdog |call script|xfhem define watchdog localhost| Entferne Sysal-Stub-Output -|call script|!-sudo rm /tmp/sysal-stub.out || true -!| +|call script|!-sudo rm /var/test/sysal-stub.out || true -!| Verkürze Zeit |call script|/opt/fhem/fhem.pl 7072 "modify watchdog +*00:00:05"| @@ -13,7 +13,7 @@ Warte Auslösezeit |call script|sleep 6| Prüfe Watchdog -|call script|grep rwd /tmp/sysal-stub.out| +|call script|grep rwd /var/test/sysal-stub.out| Entferne Watchdog |call script|xfhem delete watchdog| diff --git a/TestXfhem/bin/install-sysal-stub b/TestXfhem/bin/install-sysal-stub index 26f6b0d..fae34cb 100755 --- a/TestXfhem/bin/install-sysal-stub +++ b/TestXfhem/bin/install-sysal-stub @@ -1,12 +1,15 @@ #!/bin/bash set -e -# test if already installed +# test if apache-conf already installed if [ -e /etc/apache2/sites-enabled/sysal_stub.conf ] then exit fi +mkdir -p /var/test +chmod 777 /var/test + cwd=$(pwd) # write apache conf echo "# Apache conf for sysal stub diff --git a/TestXfhem/bin/sysal-stub.pl b/TestXfhem/bin/sysal-stub.pl index 40b0e85..03f6b95 100755 --- a/TestXfhem/bin/sysal-stub.pl +++ b/TestXfhem/bin/sysal-stub.pl @@ -4,7 +4,7 @@ print "Content-type: text/html\n\n"; print "\n"; -open (OUT, ">/tmp/sysal-stub.out"); +open (OUT, ">/var/test/sysal-stub.out"); while (my $line = ) { print OUT "$line\n"; print "$line\n"; -- 2.20.1