Merge commit 'origin/template' into dns

* commit 'origin/template':
  rsyslog: Make the main queue disk-assisted as well.
  rsyslog: Enable queuing of log messages.
  nss: Add some comments.
  rsyslog: Send all logs to the log vserver.
  rsyslog: Move all rsyslog log files into a subdir.
  rsyslog: Update logrotate config to new rsyslog config.
  rsyslog: Add default logrotate config.
  rsyslog: Disable logging of kernel messages.
  rsyslog: Enable loggin of mark lines.
  rsyslog: Clean up rsyslog configuration.
  rsyslog: Add default configuration.
  pam: Add pam_permit to the auth section of chfn.
  nss: Update to use our custom LDAP schema.
  apt: Set the Default-Release to "stable".
  pam: Let pam.d/cron include common-account.
  pam: Let pam.d/su include common{account,session}.
  pam: Make common-account also support unix users.
  pam: Add .so to module names in pam.d/other.

diff --git a/etc/dnsmasq.conf b/etc/dnsmasq.conf
new file mode 100644 (file)
index 0000000..933f2d5
--- /dev/null
+++ b/etc/dnsmasq.conf
@@ -0,0 +1,49 @@
+# See "/usr/sbin/dnsmasq --help" or /usr/share/doc/dnsmasq/examples for help on
+# the options.
+#
+# In short, this file configures dnsmasq to use /etc/hosts for resolution of
+# local names and forward the rest to a set of upstream DNS servers.
+
+# Never forward plain names (without a dot or domain part)
+domain-needed
+# Never forward (reverse queries for) addresses in the non-routed address spaces.
+bogus-priv
+
+# Only answer queries in this domain from local sources.
+local=/.drsnuggles.stderr.nl/
+
+# Don't get upstream servers from resolv.conf, but use the ones listed here
+no-resolv
+server=193.202.115.202
+server=195.85.225.170
+server=195.3.164.19
+server=193.202.115.142
+
+# Answer queries from our /etc/hosts file
+expand-hosts
+
+# This domain is appended to the short names from /etc/hosts
+domain=drsnuggles.stderr.nl
+
+# These options might be useful later on
+
+# Set the cachesize here.
+#cache-size=150
+
+# If you want to disable negative caching, uncomment this.
+#no-negcache
+
+# Normally responses which come form /etc/hosts and the DHCP lease
+# file have Time-To-Live set as zero, which conventionally means
+# do not cache further. If you are happy to trade lower load on the
+# server for potentially stale date, you can set a time-to-live (in
+# seconds) here.
+#local-ttl=
+
+# For debugging purposes, log each DNS query as it passes through
+# dnsmasq.
+# log-queries
+
+# Include a another lot of configuration options.
+#conf-file=/etc/dnsmasq.more.conf
+#conf-dir=/etc/dnsmasq.d

diff --git a/etc/hostname b/etc/hostname
new file mode 100644 (file)
index 0000000..988ced6
--- /dev/null
+++ b/etc/hostname
@@ -0,0 +1 @@
+dns.drsnuggles.stderr.nl

diff --git a/etc/hosts b/etc/hosts
new file mode 100644 (file)
index 0000000..df87caa
--- /dev/null
+++ b/etc/hosts
@@ -0,0 +1,27 @@
+# /etc/hosts
+
+127.0.0.1      localhost
+
+# The following lines are desirable for IPv6 capable hosts
+# (added automatically by netbase upgrade)
+
+::1    ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts
+
+# These entries are meant to be resolved through dnsmasq (which will also add a
+# default domain suffix).
+10.42.0.2      test
+10.42.0.3      build
+10.42.0.4      ldap
+10.42.0.5      dns
+10.42.0.254    template
+10.42.0.6      mysql
+10.42.0.7      www
+10.42.0.8      backup
+10.42.0.9      login kiiraa git.stderr.nl hg.stderr.nl svn.stderr.nl
+10.42.0.10     mail
+10.42.0.2      log

diff --git a/etc/mailname b/etc/mailname
new file mode 100644 (file)
index 0000000..988ced6
--- /dev/null
+++ b/etc/mailname
@@ -0,0 +1 @@
+dns.drsnuggles.stderr.nl

diff --git a/etc/maradns/mararc b/etc/maradns/mararc
new file mode 100644 (file)
index 0000000..8714892
--- /dev/null
+++ b/etc/maradns/mararc
@@ -0,0 +1,39 @@
+# This file configures maradns to be an authoritive-only dns server, running on
+# a non-standard port.
+#
+# See /usr/share/doc/maradns/en/examples/example_full_mararc.gz or mararc(5)
+# for more info.
+
+# Initialize this variable
+csv2 = {}
+
+# Load the zone files
+csv2["stderr.nl."]              = "db.stderr.nl"
+csv2["stdin.nl."]               = "db.stdin.nl"
+csv2["stdout.nl."]              = "db.stdout.nl"
+csv2["foresightsecurity.nl."]   = "db.foresightsecurity.nl"
+
+# The address this DNS server runs on.  If you want to bind
+# to all addresses a given machine has, use "0.0.0.0".
+bind_address = "127.0.0.1"
+
+# Run on a non-standard port, so another recursive resolver can run on port 53.
+# We will be portforwarded anyway, so this doesn't matter.
+dns_port = 54
+
+# The directory with all of the zone files
+chroot_dir = "/data/db/dns"
+
+# Run as user / group maradns
+maradns_uid = 104
+maradns_gid = 104
+
+# The number of messages we log to stdout
+# 0: No messages except for fatal parsing errors and the legal disclaimer
+# 1: Only startup messages logged (default)
+# 2: Error queries logged
+# 3: All queries logged (but not very verbosely right now)
+verbose_level = 1
+
+# Don't show the (long) disclaimer in syslog
+hide_disclaimer = "yes"