diff --git a/etc/.gitignore b/etc/.gitignore index 8916022..487cfbb 100644 --- a/etc/.gitignore +++ b/etc/.gitignore @@ -63,12 +63,14 @@ /mail.rc /man.conf /mke2fs.conf +/modulefiles/ /modprobe.d/ /modules-load.d/ /mpv/ /mtab /mtools.conf /netconfig +/nftables/ /nsswitch.conf /os-release /pam.d/ diff --git a/etc/cron.daily/netbox-housekeeping b/etc/cron.daily/netbox-housekeeping new file mode 100755 index 0000000..5b1c46c --- /dev/null +++ b/etc/cron.daily/netbox-housekeeping @@ -0,0 +1,9 @@ +#!/bin/sh +# This shell script invokes NetBox's housekeeping management command, which +# intended to be run nightly. This script can be copied into your system's +# daily cron directory (e.g. /etc/cron.daily), or referenced directly from +# within the cron configuration file. +# +# If NetBox has been installed into a nonstandard location, update the paths +# below. +/opt/netbox/venv/bin/python /opt/netbox/netbox/manage.py housekeeping diff --git a/etc/cups/printers.conf b/etc/cups/printers.conf index 5a67ebb..85f9a3b 100644 --- a/etc/cups/printers.conf +++ b/etc/cups/printers.conf @@ -11,13 +11,12 @@ Location MakeModel Generic PCL Laser Printer DeviceURI http://172.16.5.203 State Idle -StateTime 1723654311 +StateTime 1728479794 ConfigTime 1710247750 Reason cups-ipp-conformance-failure-report Reason cups-ipp-missing-send-document Reason media-empty Reason media-needed -Reason output-area-full Type 12356 Accepting Yes Shared No @@ -28,11 +27,11 @@ KLimit 0 OpPolicy default ErrorPolicy stop-printer Attribute marker-colors \#FFFFFF,#00FFFF,#FF00FF,#FFFF00 -Attribute marker-levels 55,51,51,51 +Attribute marker-levels 30,25,25,25 Attribute marker-low-levels 5,5,5,5 Attribute marker-high-levels 100,100,100,100 Attribute marker-message marker-message Attribute marker-names Black Toner Cartridge,Cyan Toner Cartridge,Magenta Toner Cartridge,Yellow Toner Cartridge Attribute marker-types toner,toner,toner,toner -Attribute marker-change-time 1723654289 +Attribute marker-change-time 1728479772 diff --git a/etc/group b/etc/group index a5ace0c..5cd31c1 100644 --- a/etc/group +++ b/etc/group @@ -49,3 +49,4 @@ mysql:x:983: postgres:x:982: redis:x:981: netbox:x:980: +docker:x:979: diff --git a/etc/logrotate.d/apache b/etc/logrotate.d/apache new file mode 100644 index 0000000..c9c2f7a --- /dev/null +++ b/etc/logrotate.d/apache @@ -0,0 +1,5 @@ +/var/log/httpd/*log { + postrotate + /etc/init.d/apache reload >/dev/null 2>&1 || true + endscript +} diff --git a/etc/ntp.conf b/etc/ntp.conf index 6c9a615..97d7a96 100644 --- a/etc/ntp.conf +++ b/etc/ntp.conf @@ -17,7 +17,7 @@ restrict -4 127.0.0.1 limited nomodify nopeer notrap kod restrict -6 ::1 limited nomodify nopeer notrap kod # Allow local networks to sync with us. -restrict 10.0.0.0 mask 255.0.0.0 limited nomodify notrap kod +restrict -4 10.0.0.0 mask 255.0.0.0 limited nomodify notrap kod # Where to store the drift calculation. driftfile /var/db/ntpd/drift diff --git a/etc/passwd b/etc/passwd index 2f6ad3f..b039f36 100644 --- a/etc/passwd +++ b/etc/passwd @@ -7,7 +7,7 @@ polkitd:x:997:993:polkitd unprivileged user:/var/empty:/sbin/nologin cups:x:996:10:cups unprivileged user:/var/spool/cups:/sbin/nologin _saned:x:995:988:_saned unprivileged user:/var/empty:/sbin/nologin _mlocate:x:994:993:_mlocate unprivileged user:/var/empty:/sbin/nologin -rpc:x:993:992:rpc unprivileged user:/var/empty:/sbin/nologin +rpc:x:993:990:rpc unprivileged user:/var/empty:/sbin/nologin ntpd:x:992:991:ntpd unprivileged user:/var/db/ntpd:/sbin/nologin rtkit:x:991:990:rtkit unprivileged user:/proc:/sbin/nologin pulse:x:990:991:pulse unprivileged user:/var/empty:/sbin/nologin diff --git a/etc/pkglist b/etc/pkglist index f0d5512..4dd795a 100644 --- a/etc/pkglist +++ b/etc/pkglist @@ -42,6 +42,7 @@ base-files base-system bash bc +beanshell bind-libs bind-utils binutils @@ -250,6 +251,7 @@ hdf5 hdparm hicolor-icon-theme highway +hsqldb1.8.0 htop hunspell hunspell-de @@ -420,6 +422,7 @@ libclang libclang-cpp17 libclang17 libcloudproviders +libcmis libcolord libcolord-32bit libcrypto1.1 @@ -859,7 +862,6 @@ mlocate mobile-broadband-provider-info moreutils mousepad -mozjs102 mozjs115 mpfr mpv @@ -903,10 +905,8 @@ oclock oneVPL oniguruma openbox -openjdk openjdk-common -openjdk8 -openjdk8-jre +openjdk21-jre openresolv openssh openssl @@ -1034,7 +1034,6 @@ python3-paramiko python3-parsing python3-pip python3-ply -python3-pyasn1 python3-pycparser python3-pynacl python3-pytz @@ -1075,6 +1074,7 @@ qt6-widgets qtchooser redis removed-packages +rhino rofi rpcbind rsync diff --git a/etc/rc.conf b/etc/rc.conf index ff4814c..263214e 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -23,7 +23,7 @@ HARDWARECLOCK="UTC" KEYMAP=uk # Console font to load, see setfont(8). -FONT="ter-v28n" +FONT="ter-122n" # Console map to load, see setfont(8). #FONT_MAP= diff --git a/etc/runit/runsvdir/default/cups-browsed b/etc/runit/runsvdir/default/cups-browsed deleted file mode 120000 index 86acb9c..0000000 --- a/etc/runit/runsvdir/default/cups-browsed +++ /dev/null @@ -1 +0,0 @@ -/etc/sv/cups-browsed \ No newline at end of file diff --git a/etc/runit/runsvdir/default/mysqld b/etc/runit/runsvdir/default/mysqld deleted file mode 120000 index b2aaa99..0000000 --- a/etc/runit/runsvdir/default/mysqld +++ /dev/null @@ -1 +0,0 @@ -/etc/sv/mysqld \ No newline at end of file diff --git a/etc/sv/.gitignore b/etc/sv/.gitignore index 925e671..6213727 100644 --- a/etc/sv/.gitignore +++ b/etc/sv/.gitignore @@ -38,10 +38,15 @@ /lxdm/ /mdadm/ /mysqld/ +/netbox-rq/ +/netbox/ /nfs-server/ +/nftables/ /ntpd /php-fpm8.3/ /polkitd/ +/postgresql16/ +/redis/ /rpcbind/ /rpcblkmapd/ /rpcgssd/