Updated all templates to use instance variables

This commit is contained in:
Ossi Salmi 2013-05-05 00:07:55 +03:00
parent a0c854d3c0
commit dc51af1ca2
113 changed files with 527 additions and 522 deletions

View file

@ -1,11 +1,11 @@
#!/bin/bash
NETWORK_IFC="<%= interface_real %>"
CAPTURE_DIR="/var/lib/recorder/<%= name %>"
SNAPLEN="<%= snaplen %>"
KEEPTIME="<%= keeptime %>"
BLOCKSIZE="<%= blocksize %>"
FILTER="<%= filter %>"
OPTIONS="<%= probeopt %>"
NETWORK_IFC="<%= @interface_real %>"
CAPTURE_DIR="/var/lib/recorder/<%= @name %>"
SNAPLEN="<%= @snaplen %>"
KEEPTIME="<%= @keeptime %>"
BLOCKSIZE="<%= @blocksize %>"
FILTER="<%= @filter %>"
OPTIONS="<%= @probeopt %>"
. /etc/clarified/clarified-functions

View file

@ -1,10 +1,10 @@
#!/bin/bash
CAPTURE_DIR="/var/lib/recorder/<%= name %>"
PRIVATE_CERT="<%= puppet_ssldir %>/private_keys/<%= homename %>.pem"
PUBLIC_CERT="<%= puppet_ssldir %>/certs/<%= homename %>.pem"
PORT="<%= remoteport %>"
COLLAB="<%= collab.join(" ") %>"
OPTIONS="<%= remoteopt %>"
CAPTURE_DIR="/var/lib/recorder/<%= @name %>"
PRIVATE_CERT="<%= @puppet_ssldir %>/private_keys/<%= @homename %>.pem"
PUBLIC_CERT="<%= @puppet_ssldir %>/certs/<%= @homename %>.pem"
PORT="<%= @remoteport %>"
COLLAB="<%= @collab.join(" ") %>"
OPTIONS="<%= @remoteopt %>"
. /etc/clarified/clarified-functions