From 404358dcd8280e307ba4689707b2ac2c75dc035b Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 26 Jan 2012 13:21:37 +0100 Subject: [PATCH] New state --- cups/printers.conf | 2 +- cups/printers.conf.O | 2 +- logrotate.d/elog-save-summary | 2 +- motd | 17 ++++++++++++----- samba/smb.conf | 23 ++++++++++++----------- syslog-ng/syslog-ng.conf | 3 +++ 6 files changed, 30 insertions(+), 19 deletions(-) diff --git a/cups/printers.conf b/cups/printers.conf index 5b1869a5..edb33a80 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,5 +1,5 @@ # Printer configuration file for CUPS v1.4.8 -# Written by cupsd on 2012-01-24 08:12 +# Written by cupsd on 2012-01-26 07:42 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING Info Kyocera FS-1020D diff --git a/cups/printers.conf.O b/cups/printers.conf.O index e5442f13..017e35eb 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -1,5 +1,5 @@ # Printer configuration file for CUPS v1.4.8 -# Written by cupsd on 2012-01-23 06:47 +# Written by cupsd on 2012-01-25 08:02 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING Info Kyocera FS-1020D diff --git a/logrotate.d/elog-save-summary b/logrotate.d/elog-save-summary index f2cfc667..029a5a04 100644 --- a/logrotate.d/elog-save-summary +++ b/logrotate.d/elog-save-summary @@ -3,7 +3,7 @@ # Rotate the log created by the save_summary elog module. /var/log/portage/elog/summary.log { - su portage portage + #su portage portage missingok nocreate delaycompress diff --git a/motd b/motd index d44db477..2b77eb92 100644 --- a/motd +++ b/motd @@ -7,10 +7,17 @@ Gentoo Base System release 2.0.3 |____/|_| \__,_|_| |_|_| -Gewinsel haben wir hier schon besser gesehen. Von Haluk z.B. +Die ersten Christen müssen schon ein ziemlich schlechtes Bild von sich +gegeben haben, wenn man sie der Menschenfresserei beschuldigte. Ich +meinerseits muß gestehen, mir wäre es lieber, wenn sie damals ein oder +zwei kleine Jungen gefressen hätten, statt so viele Unschuldige zu +verbrennen, die Massaker der Albigenser, der Einwohner von Mérindol +und Carbrières, der Bartholomäusnacht und so viele andere Greueltaten +zu begehen. Dieser Schandfleck ist unser besonderes Kennzeichen. +Unsere Religion muß schon sehr wahr sein, da niemals der Gedanke +aufgetaucht ist, daß man ihr vielleicht schaden könnte, wenn man sie +in dieser Weise predigte. + -- François Marie Voltaire --- Felix von Leitner in de.comp.security.firewall - 2002-05-07 <3cd8588f@fefe.de> - -Today is Prickle-Prickle, the 24th day of Chaos in the YOLD 3178 +Today is Sweetmorn, the 26th day of Chaos in the YOLD 3178 diff --git a/samba/smb.conf b/samba/smb.conf index c3ed0764..43e7c537 100644 --- a/samba/smb.conf +++ b/samba/smb.conf @@ -6,10 +6,10 @@ netbios name = Bruni server string = %h ; server string = %h - (Samba %v) + load printers = yes + printing = cups ; printcap name = cups printcap name = /etc/printcap - load printers = no - printing = CUPS ; printer admin = @adm ; printer admin = @"Domain Admins" log file = /var/log/samba/log.%m @@ -102,7 +102,7 @@ #============================ Share Definitions ============================== [homes] comment = Home Directories - browseable = yes + browseable = no writable = yes printable = no create mask = 0664 @@ -134,17 +134,18 @@ writable = no printable = yes create mode = 0700 + printer admin = root, @lp #print command = lpr-cups -P %p -o raw %s -r # using client side printer drivers. ; print command = lpr-cups -P %p %s # using cups own drivers (use generic PostScript on clients). ; lpq command = lpq -P %p ; lprm command = cancel %p-%j -[print$] - path = /var/lib/samba/printers - browseable = yes - read only = yes - write list = @adm root - guest ok = yes +#[print$] +# path = /var/lib/samba/printers +# browseable = yes +# read only = yes +# write list = @adm root +# guest ok = yes [all] path = /data/all @@ -157,14 +158,14 @@ create mask = 0664 directory mask = 0775 guest ok = yes -; vfs object = /usr/lib/samba/vfs/audit.so +# vfs object = /usr/lib/samba/vfs/audit.so [inst] path = /data/inst browseable = yes comment = Installations-Dateien public = yes -; only guest = yes + only guest = yes writable = no write list = @users printable = no diff --git a/syslog-ng/syslog-ng.conf b/syslog-ng/syslog-ng.conf index 8f9fc4a6..20986b05 100644 --- a/syslog-ng/syslog-ng.conf +++ b/syslog-ng/syslog-ng.conf @@ -18,6 +18,9 @@ options { # people so turn it down to once an hour. Set it to zero # if you don't want the functionality at all. mark_freq(3600); + + frac_digits(3); + ts_format(iso); }; source src { -- 2.39.5