rename etc/syslog.conf -> syslog.conf.dist, to not clobber the real .conf
authorTero Marttila <terom@paivola.fi>
Sat, 12 Jan 2013 19:00:48 +0200
changeset 97 cc559fb45cb2
parent 96 d02b0b67c29c
child 98 b11a8ef6725f
child 104 2e139fa0e8eb
rename etc/syslog.conf -> syslog.conf.dist, to not clobber the real .conf
MANIFEST.in
etc/syslog.conf
etc/syslog.conf.dist
setup.py
--- a/MANIFEST.in	Sat Jan 12 16:14:00 2013 +0200
+++ b/MANIFEST.in	Sat Jan 12 19:00:48 2013 +0200
@@ -1,1 +1,1 @@
-include etc/*.conf
+include etc/*.conf.dist
--- a/etc/syslog.conf	Sat Jan 12 16:14:00 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-irk     = irc://syslog@irc-test/test
-
-# TODO: implements meta-attrs across rule tree to classify hosts?
-#[tag]
-#    [[puppetmaster]]
-#        host    = guru
-#
-#    [[auth-high]]
-#        host    = guru
-
-# auth on normal hosts
-[auth]
-    facility    = auth*
-
-    [[sudo]]
-    program     = sudo
-    pattern     = (?P<login>\S+) : TTY=(?P<tty>\S+) ; PWD=(?P<pwd>.+?) ; USER=(?P<user>\S+) ; (?:ENV=(?P<env>.+?) ; )?COMMAND=(?P<command>.*)
-    format      = {login}:{tty} - {user}@{host}:{pwd} - {command!r}
-    
-    # ignore puppet readshadow on puppetmasters
-    [[[puppet_readshadow]]]
-    login       = puppet
-    user        = root
-    command     = /usr/bin/getent shadow \w+
-    format      = # ignore
-
-    [[[env]]]
-    env         = .+
-    format      = {login}:{tty} - {user}@{host}:{pwd} - {env}{command!r}
-
-    [[sudo-unknown]]
-    program     = sudo
-    format      = {host} {msg}
-    
-# auth on high-sec hosts
-[auth-high]
-    host        = .+
-    facility    = auth*
-    
-    # TODO: pubkey, failures?
-    [[ssh]]
-    program     = sshd
-    pattern     = Accepted (?P<auth>.+?) for (?P<user>\S+) from (?P<ip>\S+) port (?P<port>\S+) (?P<proto>\S+)
-    format      = SSH {auth} login for {user}@{host} from {ip}
-
-    [[cron]]
-    program     = cron
-    format      = # ignore
-
-    [[su_nobody]]
-    program     = su
-    pattern     = Successful su for nobody by root|\+ \?\?\? root:nobody
-    format      = # ignore
-
-    [[all]]
-    format      = {host} {msg}
-
-# user
-[user]
-    facility    = user
-
-    [[puppet]]
-    program     = puppet
-    format      = {host} {msg}
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/syslog.conf.dist	Sat Jan 12 19:00:48 2013 +0200
@@ -0,0 +1,65 @@
+irk     = irc://syslog@irc-test/test
+
+# TODO: implements meta-attrs across rule tree to classify hosts?
+#[tag]
+#    [[puppetmaster]]
+#        host    = guru
+#
+#    [[auth-high]]
+#        host    = guru
+
+# auth on normal hosts
+[auth]
+    facility    = auth*
+
+    [[sudo]]
+    program     = sudo
+    pattern     = (?P<login>\S+) : TTY=(?P<tty>\S+) ; PWD=(?P<pwd>.+?) ; USER=(?P<user>\S+) ; (?:ENV=(?P<env>.+?) ; )?COMMAND=(?P<command>.*)
+    format      = {login}:{tty} - {user}@{host}:{pwd} - {command!r}
+    
+    # ignore puppet readshadow on puppetmasters
+    [[[puppet_readshadow]]]
+    login       = puppet
+    user        = root
+    command     = /usr/bin/getent shadow \w+
+    format      = # ignore
+
+    [[[env]]]
+    env         = .+
+    format      = {login}:{tty} - {user}@{host}:{pwd} - {env}{command!r}
+
+    [[sudo-unknown]]
+    program     = sudo
+    format      = {host} {msg}
+    
+# auth on high-sec hosts
+[auth-high]
+    host        = .+
+    facility    = auth*
+    
+    # TODO: pubkey, failures?
+    [[ssh]]
+    program     = sshd
+    pattern     = Accepted (?P<auth>.+?) for (?P<user>\S+) from (?P<ip>\S+) port (?P<port>\S+) (?P<proto>\S+)
+    format      = SSH {auth} login for {user}@{host} from {ip}
+
+    [[cron]]
+    program     = cron
+    format      = # ignore
+
+    [[su_nobody]]
+    program     = su
+    pattern     = Successful su for nobody by root|\+ \?\?\? root:nobody
+    format      = # ignore
+
+    [[all]]
+    format      = {host} {msg}
+
+# user
+[user]
+    facility    = user
+
+    [[puppet]]
+    program     = puppet
+    format      = {host} {msg}
+
--- a/setup.py	Sat Jan 12 16:14:00 2013 +0200
+++ b/setup.py	Sat Jan 12 19:00:48 2013 +0200
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
-__version__ = '0.1dev'
+__version__ = '0.2dev'
 
 from distutils.core import setup
 
@@ -27,7 +27,7 @@
     ],
 
     data_files  = [
-        ('etc/pvl', [ 'etc/syslog.conf' ] ),
+        ('etc/pvl', [ 'etc/syslog.conf.dist' ] ),
     ],
 )