projects / xhome.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b284e1e)
epic-ukulele
authorMichael Wagner <michael@wagnertech.de>
Tue, 25 Feb 2020 02:22:27 +0000 (03:22 +0100)
committerMichael Wagner <michael@wagnertech.de>
Tue, 25 Feb 2020 02:22:27 +0000 (03:22 +0100)
TestXfhem/FitnessePages/AaaPrepare/content.txt patch | blob | history
TestXfhem/FitnessePages/TestWatchdog/content.txt patch | blob | history
TestXfhem/bin/install-sysal-stub patch | blob | history
TestXfhem/bin/sysal-stub.pl patch | blob | history

diff --git a/TestXfhem/FitnessePages/AaaPrepare/content.txt b/TestXfhem/FitnessePages/AaaPrepare/content.txt
index 5fa4f14..b75ee2f 100644 (file)
--- 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 (file)
--- 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 (executable)
--- 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 (executable)
--- a/TestXfhem/bin/sysal-stub.pl
+++ b/TestXfhem/bin/sysal-stub.pl
@@ -4,7 +4,7 @@ print "Content-type: text/html\n\n";
 print "<html><body>\n";
 
 
-open (OUT, ">/tmp/sysal-stub.out");
+open (OUT, ">/var/test/sysal-stub.out");
 while (my $line = <STDIN>) {
        print OUT "$line\n";
        print "$line\n";
xhome