diff options
author | Erich Eckner <git@eckner.net> | 2016-04-29 20:45:06 +0200 |
---|---|---|
committer | Erich Eckner <git@eckner.net> | 2016-04-29 20:45:06 +0200 |
commit | 1b9637ae398e6747c3c720191bcc9fa4a16e7570 (patch) | |
tree | 72b584b15b284fc8a3427677178c15b28bee60ad | |
parent | cec287fd6614f490346a21f371749d7ec74fbbcb (diff) | |
download | Netzwerkwatchdog-1b9637ae398e6747c3c720191bcc9fa4a16e7570.tar.xz |
ca-Zertifikate jetzt implizit von curl
-rw-r--r-- | komponenten.pas | 4 | ||||
-rw-r--r-- | tests.konf | 5 | ||||
-rw-r--r-- | watchdog.lps | 87 |
3 files changed, 47 insertions, 49 deletions
diff --git a/komponenten.pas b/komponenten.pas index 2a2079f..b0915f2 100644 --- a/komponenten.pas +++ b/komponenten.pas @@ -511,9 +511,9 @@ begin if pos(';',s)=0 then cert:='' else cert:=erstesArgument(s,';'); quelle:=s; - if pos('/',vergleich)=0 then + if pos('/',vergleich)<>1 then vergleich:=extractFilePath(application.exeName)+vergleich; - if pos('/',cert)=0 then + if (cert<>'') and (pos('/',cert)<>1) then cert:=extractFilePath(application.exeName)+cert; result:=fileexists(vergleich); if (cert<>'') and not fileexists(cert) then @@ -8,6 +8,5 @@ ping 0_1_& 600 50 google (ping) www.google.de ping 0_1_& 600 50 eckner.net (ping) eckner.net
remcmp 0_3_& 600 50 Festplatte status.txt;ftp://erich:erichmitgrossemE@192.168.0.15/tmp/ftpstatus
remdate 0_3_&0_7_& 60000 60000 Festplattenjob 90;ftp://erich:erichmitgrossemE@192.168.0.15/tmp/ftpstatus.time
-remcmp 0_4_& 600 50 Musik-Crypto musikStatus.txt;ca.crt;https://192.168.0.18/status.php
-remcmp 0_2_&0_6_& 600 100 dns dnsStatus.txt;ca.crt;https://eckner.net/iptest.php
-
+remcmp 0_4_& 600 50 Musik-Crypto musikStatus.txt;https://192.168.0.18/status.php
+remcmp 0_2_&0_6_& 600 100 dns dnsStatus.txt;https://eckner.net/iptest.php
diff --git a/watchdog.lps b/watchdog.lps index 37328ae..a53ce01 100644 --- a/watchdog.lps +++ b/watchdog.lps @@ -18,8 +18,6 @@ <HasResources Value="True"/> <ResourceBaseClass Value="Form"/> <UnitName Value="Unit1"/> - <TopLine Value="101"/> - <CursorPos X="25" Y="123"/> <UsageCount Value="28"/> <Loaded Value="True"/> <LoadedDesigner Value="True"/> @@ -29,7 +27,8 @@ <IsPartOfProject Value="True"/> <IsVisibleTab Value="True"/> <EditorIndex Value="2"/> - <TopLine Value="109"/> + <TopLine Value="488"/> + <CursorPos X="40" Y="516"/> <UsageCount Value="28"/> <Loaded Value="True"/> </Unit2> @@ -50,7 +49,7 @@ <Unit5> <Filename Value="tests.konf"/> <EditorIndex Value="1"/> - <CursorPos X="66" Y="10"/> + <CursorPos X="92" Y="12"/> <UsageCount Value="13"/> <Loaded Value="True"/> <DefaultSyntaxHighlighter Value="None"/> @@ -59,122 +58,122 @@ <JumpHistory Count="30" HistoryIndex="29"> <Position1> <Filename Value="komponenten.pas"/> - <Caret Line="561" TopLine="528"/> + <Caret Line="291" Column="39" TopLine="161"/> </Position1> <Position2> <Filename Value="komponenten.pas"/> - <Caret Line="117" TopLine="95"/> + <Caret Line="526" Column="9" TopLine="505"/> </Position2> <Position3> - <Filename Value="komponenten.pas"/> - <Caret Line="513" Column="15" TopLine="491"/> + <Filename Value="unit1.pas"/> + <Caret Line="116" Column="88" TopLine="98"/> </Position3> <Position4> <Filename Value="komponenten.pas"/> - <Caret Line="508" Column="37" TopLine="497"/> + <Caret Line="539" Column="21" TopLine="503"/> </Position4> <Position5> <Filename Value="komponenten.pas"/> - <Caret Line="291" Column="39" TopLine="161"/> + <Caret Line="537" TopLine="529"/> </Position5> <Position6> <Filename Value="komponenten.pas"/> - <Caret Line="526" Column="9" TopLine="505"/> + <Caret Line="120" Column="18" TopLine="91"/> </Position6> <Position7> - <Filename Value="unit1.pas"/> - <Caret Line="116" Column="88" TopLine="98"/> + <Filename Value="komponenten.pas"/> + <Caret Line="89" TopLine="43"/> </Position7> <Position8> <Filename Value="komponenten.pas"/> - <Caret Line="539" Column="21" TopLine="503"/> + <Caret Line="563" Column="16" TopLine="501"/> </Position8> <Position9> <Filename Value="komponenten.pas"/> - <Caret Line="537" TopLine="529"/> + <Caret Line="45" TopLine="45"/> </Position9> <Position10> <Filename Value="komponenten.pas"/> - <Caret Line="120" Column="18" TopLine="91"/> + <Caret Line="584" Column="46" TopLine="542"/> </Position10> <Position11> <Filename Value="komponenten.pas"/> - <Caret Line="89" TopLine="43"/> + <Caret Line="613" TopLine="572"/> </Position11> <Position12> <Filename Value="komponenten.pas"/> - <Caret Line="563" Column="16" TopLine="501"/> + <Caret Line="592" Column="35" TopLine="570"/> </Position12> <Position13> - <Filename Value="komponenten.pas"/> - <Caret Line="45" TopLine="45"/> + <Filename Value="unit1.pas"/> + <Caret Line="116" Column="88" TopLine="98"/> </Position13> <Position14> - <Filename Value="komponenten.pas"/> - <Caret Line="584" Column="46" TopLine="542"/> + <Filename Value="unit1.pas"/> + <Caret Line="58" TopLine="50"/> </Position14> <Position15> - <Filename Value="komponenten.pas"/> - <Caret Line="613" TopLine="572"/> + <Filename Value="unit1.pas"/> + <Caret Line="85" TopLine="75"/> </Position15> <Position16> - <Filename Value="komponenten.pas"/> - <Caret Line="592" Column="35" TopLine="570"/> + <Filename Value="unit1.pas"/> + <Caret Line="58" Column="14" TopLine="47"/> </Position16> <Position17> <Filename Value="unit1.pas"/> - <Caret Line="116" Column="88" TopLine="98"/> + <Caret Line="37" Column="30" TopLine="15"/> </Position17> <Position18> <Filename Value="unit1.pas"/> - <Caret Line="58" TopLine="50"/> + <Caret Line="58" Column="18" TopLine="22"/> </Position18> <Position19> <Filename Value="unit1.pas"/> - <Caret Line="85" TopLine="75"/> + <Caret Line="137" Column="77" TopLine="102"/> </Position19> <Position20> <Filename Value="unit1.pas"/> - <Caret Line="58" Column="14" TopLine="47"/> + <Caret Line="142" Column="33" TopLine="136"/> </Position20> <Position21> <Filename Value="unit1.pas"/> - <Caret Line="37" Column="30" TopLine="15"/> + <Caret Line="78" TopLine="70"/> </Position21> <Position22> <Filename Value="unit1.pas"/> - <Caret Line="58" Column="18" TopLine="22"/> + <Caret Line="79" TopLine="70"/> </Position22> <Position23> <Filename Value="unit1.pas"/> - <Caret Line="137" Column="77" TopLine="102"/> + <Caret Line="124" TopLine="103"/> </Position23> <Position24> - <Filename Value="unit1.pas"/> - <Caret Line="142" Column="33" TopLine="136"/> + <Filename Value="komponenten.pas"/> + <Caret Line="573" Column="29" TopLine="535"/> </Position24> <Position25> - <Filename Value="unit1.pas"/> - <Caret Line="78" TopLine="70"/> + <Filename Value="komponenten.pas"/> + <Caret Line="563" Column="17" TopLine="520"/> </Position25> <Position26> - <Filename Value="unit1.pas"/> - <Caret Line="79" TopLine="70"/> + <Filename Value="komponenten.pas"/> </Position26> <Position27> - <Filename Value="unit1.pas"/> - <Caret Line="124" TopLine="103"/> + <Filename Value="komponenten.pas"/> + <Caret Line="109" Column="21" TopLine="100"/> </Position27> <Position28> <Filename Value="komponenten.pas"/> - <Caret Line="573" Column="29" TopLine="535"/> + <Caret Line="294" Column="34" TopLine="258"/> </Position28> <Position29> - <Filename Value="komponenten.pas"/> - <Caret Line="563" Column="17" TopLine="520"/> + <Filename Value="unit1.pas"/> + <Caret Line="123" Column="25" TopLine="101"/> </Position29> <Position30> <Filename Value="komponenten.pas"/> + <Caret Line="481" Column="42" TopLine="460"/> </Position30> </JumpHistory> </ProjectSession> |