Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 410ffe43eb2326b122d531b0319962513062b5cf..79c8cc18a249d8ed97286fd79f05829361759908 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -65,6 +65,8 @@ nameinfo:
   pescetti.debian.org: Giovanni Battista Pescetti (ca. 1704  - 1766)
   pettersson.debian.org: Gustav Allan Pettersson (September 19th, 1911 - June 20th, 1980)
   piatti.debian.org: Carlo Alfredo Piatti (January 8th, 1822 - July 18th, 1901)
+  polenc.debian.org: Francis Jean Marcel Poulenc (January 7, 1899 - January 30, 1963)
+  porpora.debian.org: Niccolò (Antonio) Porpora (17 August 1686 - 3 March 1768)
   powell.debian.org: Andrew Powell (b. April 18th, 1949)
   praetorius.debian.org: Hieronymus Praetorius (August 10th, 1560 - January 27th, 1629)
   puccini.debian.org: Giacomo Antonio Domenico Michele Secondo Maria Puccini (December 22nd, 1858 - November 29th, 1924)
@@ -178,6 +180,8 @@ host_settings:
     - murphy.debian.org
     - penalosa.debian.org
     - peri.debian.org
+    - porpora.debian.org
+    - poulenc.debian.org
     - praetorius.debian.org
     - puccini.debian.org
     - purcell.debian.org
@@ -260,6 +264,8 @@ host_settings:
     pescetti.debian.org: mailout.debian.org
     pettersson.debian.org: mailout.debian.org
     piatti.debian.org: mailout.debian.org
+    porpora.debian.org: mailout.debian.org
+    poulenc.debian.org: mailout.debian.org
     praetorius.debian.org: mailout.debian.org
     puccini.debian.org: mailout.debian.org
     purcell.debian.org: mailout.debian.org

diff --git a/modules/ferm/files/ferm.conf b/modules/ferm/files/ferm.conf
index 5f6e159f67145ba6119fb0bd85989921791869bc..a88d797c0bd4bdef6d95aa1a3d965168a6d9f44b 100644 (file)
--- a/modules/ferm/files/ferm.conf
+++ b/modules/ferm/files/ferm.conf
@@ -41,7 +41,7 @@ domain ip6 {
 domain (ip ip6) {
         table filter {
               chain INPUT {
-                      policy DROP;
+                      policy ACCEPT;
                       mod state state (ESTABLISHED RELATED) ACCEPT;
                       interface lo ACCEPT;
                       proto icmp ACCEPT;

diff --git a/templates/syslog-ng.conf.erb b/templates/syslog-ng.conf.erb
index 74dc79f3abfc39099e056c8cf989b7f7074c00ed..6231a763c3789c6490ff91b803a9fc7c67b93ae7 100644 (file)
--- a/templates/syslog-ng.conf.erb
+++ b/templates/syslog-ng.conf.erb
@@ -1,4 +1,4 @@
-<%- if syslogversion == "3" -%>
+<%- if defined? syslogversion && syslogversion.to_s == "3" -%>
 @version: 3.0
 <%- end -%>
 ##
@@ -102,7 +102,7 @@ source s_local {
         # function to send logs to)
         unix-stream("/dev/log");
         # messages from the kernel
-<%- if syslogversion == "2" -%>
+<%- if defined? syslogversion && syslogversion.to_s == "2" -%>
         file("/proc/kmsg" log_prefix("kernel: "));
 <%- else -%>
         file("/proc/kmsg" program_override("kernel: "));
@@ -112,7 +112,7 @@ source s_local {
         # function to send logs to)
         unix-dgram("/var/run/log");
         # messages from the kernel
-<%- if syslogversion == "2" -%>
+<%- if defined? syslogversion && syslogversion.to_s == "2" -%>
         file("/dev/klog" log_prefix("kernel: "));
 <%- else -%>
         file("/dev/klog" program_override("kernel: "));
@@ -404,7 +404,7 @@ log {
 
 
 <%- if hostname != "heininen" -%>
- <%- if syslogversion == "3" -%>
+ <%- if defined? syslogversion && syslogversion.to_s == "3" -%>
 destination loghost-heininen {
        tcp("heininen.debian.org" port (5140)
                tls( key_file("/etc/ssl/debian/keys/thishost.key")