aboutsummaryrefslogtreecommitdiffstats
path: root/modules/xymon/templates/hobbitserver.cfg
diff options
context:
space:
mode:
authorDan Fandrich <danf@mageia.org>2024-10-04 21:44:50 -0700
committerDan Fandrich <danf@mageia.org>2024-10-04 21:48:08 -0700
commitf5b2645d869b76598c18527d388ed76719c06bdd (patch)
tree659f3ee719b437817a02db4a31dbd37a65972412 /modules/xymon/templates/hobbitserver.cfg
parentae1976228660588902a904f7509a106b790531cb (diff)
downloadpuppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar
puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.gz
puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.bz2
puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.xz
puppet-f5b2645d869b76598c18527d388ed76719c06bdd.zip
Revert "Use @ when accessing variables in templates"
Variables defined within a template can't be accessed with @. This change needs to be reworked to eliminate those cases. This reverts commits 2c7da665 and ae197622.
Diffstat (limited to 'modules/xymon/templates/hobbitserver.cfg')
-rw-r--r--modules/xymon/templates/hobbitserver.cfg14
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/xymon/templates/hobbitserver.cfg b/modules/xymon/templates/hobbitserver.cfg
index f2da8a6a..a5a7aacf 100644
--- a/modules/xymon/templates/hobbitserver.cfg
+++ b/modules/xymon/templates/hobbitserver.cfg
@@ -1,15 +1,15 @@
# NB : Even though it might look like a shell-script, it is NOT.
#
-BBSERVERROOT="<%= @lib_dir %>/xymon" # Where Xymon is installed - holds the server and bbvar sub-dirs.
+BBSERVERROOT="<%= lib_dir %>/xymon" # Where Xymon is installed - holds the server and bbvar sub-dirs.
BBSERVERLOGS="/var/log/xymon" # Directory for server logs. The hobbit user must have write-access here.
-HOBBITCLIENTHOME="<%= @lib_dir %>/xymon/client" # BBHOME directory for the client
+HOBBITCLIENTHOME="<%= lib_dir %>/xymon/client" # BBHOME directory for the client
-BBSERVERHOSTNAME="sucuk.<%= @domain %>" # The hostname of your server
-BBSERVERIP="<%= @ipaddress %>" # The IP-address of your server. Use the real one, not 127.0.0.1 .
+BBSERVERHOSTNAME="sucuk.<%= domain %>" # The hostname of your server
+BBSERVERIP="<%= ipaddress %>" # The IP-address of your server. Use the real one, not 127.0.0.1 .
BBSERVEROS="linux" # The operating system of your server. linux,freebsd,solaris,hpux,aix,osf
-BBSERVERWWWNAME="xymon.<%= @domain %>" # The name used for this hosts' webserver
+BBSERVERWWWNAME="xymon.<%= domain %>" # The name used for this hosts' webserver
BBSERVERWWWURL="/xymon" # The top URL for the Xymon webpages
BBSERVERCGIURL="/xymon-cgi" # The URL for the Xymon CGI scripts.
BBSERVERSECURECGIURL="/xymon-seccgi" # The URL for the secured Xymon CGI scripts.
@@ -73,7 +73,7 @@ CGIBINURL="$BBSERVERCGIURL" # URL prefix for the Xymon CGI-scripts - /cgi-bin
SECURECGIBINURL="$BBSERVERSECURECGIURL" # URL prefix for the secured Xymon CGI-scripts - /cgi-secure
# Locations of system-wide files and directories
-BBHOME="<%= @lib_dir %>/xymon/server" # The Xymon server directory, where programs and configurations go.
+BBHOME="<%= lib_dir %>/xymon/server" # The Xymon server directory, where programs and configurations go.
BBTMP="$BBHOME/tmp" # Directory used for temporary files.
BBHOSTS="$BBHOME/etc/bb-hosts" # The bb-hosts file
BB="$BBHOME/bin/bb" # The 'bb' client program
@@ -99,7 +99,7 @@ BBHOSTHISTLOG="TRUE" # Save a log of all events for a host (not used by any t
SAVESTATUSLOG="TRUE" # Save the detailed status log each time the status changes.
# For the hobbitd_alert module
-FROM="root@<%= @domain %>"
+FROM="root@<%= domain %>"
MAILC="mail -r $FROM" # Command used to send an e-mail with no subject
MAIL="$MAILC -s" # Command used to send an e-mail with a subject
SVCCODES="disk:100,cpu:200,procs:300,svcs:350,msgs:400,conn:500,http:600,dns:800,smtp:725,telnet:723,ftp:721,pop:810,pop3:810,pop-3:810,ssh:722,imap:843,ssh1:722,ssh2:722,imap2:843,imap3:843,imap4:843,pop2:809,pop-2:809,nntp:819,test:901"