From 7ce3190986cf8e5fe037a7ccd4c1076505b117f4 Mon Sep 17 00:00:00 2001
From: Micah <micah@leap.se>
Date: Tue, 12 Jul 2016 16:41:59 -0400
Subject: remove submodules in preparation for move to subrepos

Change-Id: Ia7655153b556337f676e3d909559c4a7306bedd6
---
 puppet/modules/rsyslog | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 puppet/modules/rsyslog

(limited to 'puppet/modules/rsyslog/templates/server')

diff --git a/puppet/modules/rsyslog b/puppet/modules/rsyslog
deleted file mode 160000
index b8ef11c2..00000000
--- a/puppet/modules/rsyslog
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b8ef11c23949d12732ad5cdaebb3023ff39a297a
-- 
cgit v1.2.3


From 1e1e25286b64790141c9627f81b50f579b13b719 Mon Sep 17 00:00:00 2001
From: Micah <micah@leap.se>
Date: Tue, 12 Jul 2016 16:46:28 -0400
Subject: git subrepo clone https://leap.se/git/puppet_rsyslog
 puppet/modules/rsyslog

subrepo:
  subdir:   "puppet/modules/rsyslog"
  merged:   "b8ef11c"
upstream:
  origin:   "https://leap.se/git/puppet_rsyslog"
  branch:   "master"
  commit:   "b8ef11c"
git-subrepo:
  version:  "0.3.0"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "1e79595"

Change-Id: Iee06502c6df609f1a261410742360cec8694dab5
---
 .../templates/server/_default-footer.conf.erb      | 13 ++++++++
 .../templates/server/_default-header.conf.erb      | 36 ++++++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 puppet/modules/rsyslog/templates/server/_default-footer.conf.erb
 create mode 100644 puppet/modules/rsyslog/templates/server/_default-header.conf.erb

(limited to 'puppet/modules/rsyslog/templates/server')

diff --git a/puppet/modules/rsyslog/templates/server/_default-footer.conf.erb b/puppet/modules/rsyslog/templates/server/_default-footer.conf.erb
new file mode 100644
index 00000000..d8bd00ad
--- /dev/null
+++ b/puppet/modules/rsyslog/templates/server/_default-footer.conf.erb
@@ -0,0 +1,13 @@
+
+# Switch back to default ruleset
+$RuleSet RSYSLOG_DefaultRuleset
+
+<% if scope.lookupvar('rsyslog::server::enable_udp') -%>
+$InputUDPServerBindRuleset remote
+$UDPServerRun <%= scope.lookupvar('rsyslog::server::port') %>
+<% end -%>
+
+<% if scope.lookupvar('rsyslog::server::enable_tcp') -%>
+$InputTCPServerBindRuleset remote
+$InputTCPServerRun <%= scope.lookupvar('rsyslog::server::port') %>
+<% end -%>
diff --git a/puppet/modules/rsyslog/templates/server/_default-header.conf.erb b/puppet/modules/rsyslog/templates/server/_default-header.conf.erb
new file mode 100644
index 00000000..4bffa858
--- /dev/null
+++ b/puppet/modules/rsyslog/templates/server/_default-header.conf.erb
@@ -0,0 +1,36 @@
+<% if scope.lookupvar('rsyslog::server::enable_udp') -%>
+# Load UDP module
+$ModLoad imudp
+<% end -%>
+
+<% if scope.lookupvar('rsyslog::server::enable_tcp') -%>
+# Load TCP module
+$ModLoad imtcp
+<% end -%>
+
+#
+<% if scope.lookupvar('rsyslog::server::high_precision_timestamps') == false -%>
+# Use traditional timestamp format.
+#
+$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
+<% else -%>
+# Use high precision timestamp format.
+#
+$ActionFileDefaultTemplate RSYSLOG_FileFormat
+<% end -%>
+
+<% if scope.lookupvar('rsyslog::server::ssl') -%>
+# Server side SSL.
+$DefaultNetstreamDriver gtls
+
+# Cert files.
+$DefaultNetstreamDriverCAFile <%= scope.lookupvar('rsyslog::server::ssl_ca') %>
+$DefaultNetstreamDriverCertFile <%= scope.lookupvar('rsyslog::server::ssl_cert') %>
+$DefaultNetstreamDriverKeyFile <%= scope.lookupvar('rsyslog::server::ssl_key') %>
+
+$InputTCPServerStreamDriverMode 1
+$InputTCPServerStreamDriverAuthMode anon
+<% end -%>
+
+# Switch to remote ruleset
+$RuleSet remote
-- 
cgit v1.2.3