summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2024-04-25 19:44:34 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2024-04-25 19:44:34 +0200
commit0171568697c70a7925ed2f1896826609e9dc5c40 (patch)
tree351e5cd59328a9231acc97d348cd31e8361d3363
parent1124e80b62bca5e49a4c81072c4b0d2811ddfebb (diff)
downloadOpenBSD-firewall-0171568697c70a7925ed2f1896826609e9dc5c40.tar.gz
OpenBSD-firewall-0171568697c70a7925ed2f1896826609e9dc5c40.tar.bz2
made newsyslog.conf a config file and not a template (needs adaption for small /var/log filesystems)
-rwxr-xr-xbuild.sh2
-rw-r--r--config/obr/newsyslog.conf (renamed from template/etc/newsyslog.conf)4
-rw-r--r--docs/HOWTO.UPGRADE2
3 files changed, 4 insertions, 4 deletions
diff --git a/build.sh b/build.sh
index cc42e88..95d3adb 100755
--- a/build.sh
+++ b/build.sh
@@ -280,7 +280,6 @@ cp -R template/etc/pf.os $MOUNTPOINT/etc/.
cp -R template/etc/syslog.conf $MOUNTPOINT/etc/.
cp -R template/etc/tabs $MOUNTPOINT/etc/.
chmod 0600 $MOUNTPOINT/etc/tabs/*
-cp -R template/etc/newsyslog.conf $MOUNTPOINT/etc/.
cp -R template/etc/ssh/sshd_config $MOUNTPOINT/etc/ssh/.
cp -R template/etc/moduli $MOUNTPOINT/etc/.
cp -R /usr/share/zoneinfo/Europe/Zurich $MOUNTPOINT/etc/localtime
@@ -294,6 +293,7 @@ cp -R config/$HOSTNAME/networks $MOUNTPOINT/etc/.
cp -R config/$HOSTNAME/pf.conf $MOUNTPOINT/etc/.
cp -R config/$HOSTNAME/badhosts $MOUNTPOINT/etc/.
cp -R config/$HOSTNAME/resolv.conf $MOUNTPOINT/etc/.
+cp -R config/$HOSTNAME/newsyslog.conf $MOUNTPOINT/etc/.
m4 -DHOSTNAME=$HOSTNAME template/etc/rc > $MOUNTPOINT/etc/rc
# depending on the existence of some config files for the specific build
diff --git a/template/etc/newsyslog.conf b/config/obr/newsyslog.conf
index 9c7c275..4647bec 100644
--- a/template/etc/newsyslog.conf
+++ b/config/obr/newsyslog.conf
@@ -4,11 +4,11 @@
#
# logfile_name owner:group mode count size when flags
/var/cron/log root:wheel 600 3 10 * Z
-/var/log/authlog root:wheel 640 7 * 168 Z
+/var/log/authlog root:wheel 640 7 10 168 Z
/var/log/daemon 640 5 30 * Z
/var/log/lpd-errs 640 7 10 * Z
/var/log/maillog 640 7 * 24 Z
/var/log/messages 644 5 30 * Z
-/var/log/secure 600 7 * 168 Z
+/var/log/secure 600 7 30 168 Z
/var/log/wtmp 644 7 * $M1D4 B ""
/var/log/pflog 600 3 25 * ZB "pkill -HUP -u root -U root -t - -x pflogd"
diff --git a/docs/HOWTO.UPGRADE b/docs/HOWTO.UPGRADE
index a0faa5d..80612dc 100644
--- a/docs/HOWTO.UPGRADE
+++ b/docs/HOWTO.UPGRADE
@@ -21,7 +21,6 @@ sync the template directory with the files found in the vanilla OpenBSD:
template/etc/boot.conf
template/etc/syslog.conf
- template/etc/newsyslog.conf
template/etc/fstab
template/etc/tabs/root
template/etc/passwd
@@ -45,6 +44,7 @@ those configs are really yours, sync them also with new concepts from upstream
config/xxx/nsd-xxx
config/xxx/relayd.conf
config/xxx/resolv.conf
+ config/xxx/newsyslog.conf
build the image