aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorU-AD\carlsoan <carlsoan@gophersjos7275.ad.uc.edu>2018-02-07 14:09:18 -0500
committerU-AD\carlsoan <carlsoan@gophersjos7275.ad.uc.edu>2018-02-07 14:09:18 -0500
commit7e69f84d5d0f4da4638508eda5b09cd1c5cb0068 (patch)
treee8bb285436ff26cedbba4b90c548f1837d1e9ccc
parent2079c96c9265a4a031444241babf9429905e316c (diff)
added make clean to default build
-rw-r--r--Makefile6
-rw-r--r--host.xml.m46
-rw-r--r--item.xml.m46
3 files changed, 13 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 757e4ea..df9378e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
define newlist
-@echo "Enter \"SERVER-NAME<SPACE>SERVER-PORT\". Enter a blank line when finished"
-@while true; do read -p "$(1): " thisval ; [[ -z "$$thisval" ]] && break ; echo "$$thisval" >> $(2) ; done
+@echo "Enter \"SERVER-NAME<SPACE>SERVER-PORT\" (omit SERVER-PORT if it is 443). Enter a blank line when finished"
+@while true; do read -p "$(1): " thisval ; [[ -z "$$thisval" ]] && break ; echo "$$thisval"; done > $(2)
endef
define newsetting
@@ -11,7 +11,7 @@ define getsetting
$$(grep "^$(2)[ \t]*" $(1) | sed 's/^$(2)[ \t]*//g')
endef
-all: build/certcheck.xml
+all: clean build/certcheck.xml
build/certcheck.xml: tmp/all-items.xml tmp/all-triggers.xml build
m4 -DHOSTGROUP="$(call getsetting,tmp/settings.txt,GROUP)" -DZBXHOST="$(call getsetting,tmp/settings.txt,HOST)" -DALLITEMS="$$(cat tmp/all-items.xml)" -DALLTRIGGERS="$$(cat tmp/all-triggers.xml)" host.xml.m4 > build/certcheck.xml
diff --git a/host.xml.m4 b/host.xml.m4
index fcca916..04053db 100644
--- a/host.xml.m4
+++ b/host.xml.m4
@@ -41,7 +41,11 @@
<interface_ref>if1</interface_ref>
</interface>
</interfaces>
- <applications/>
+ <applications>
+ <application>
+ <name>SSL Certificate Check</name>
+ </application>
+ </applications>
<items>
ALLITEMS
</items>
diff --git a/item.xml.m4 b/item.xml.m4
index 69a5314..2887359 100644
--- a/item.xml.m4
+++ b/item.xml.m4
@@ -33,7 +33,11 @@
<port/>
<description/>
<inventory_link>0</inventory_link>
- <applications/>
+ <applications>
+ <application>
+ <name>SSL Certificate Check</name>
+ </application>
+ </applications>
<valuemap/>
<logtimefmt/>
<interface_ref>if1</interface_ref>