tadgy/system-configs
1
0
Fork 0
Code Releases Wiki Activity

Many updates.

Browse source
This commit is contained in:
Darren 'Tadgy' Austin 2024-07-06 15:48:30 +01:00
commit 7ccb1aa296
37 changed files with 96 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

3
etc/.gitignore vendored
View file

@ -28,8 +28,8 @@
/exports /exports
/exports.d/ /exports.d/
/fonts/ /fonts/
/forgejo.conf
/gai.conf /gai.conf
/gitea.conf
/gprofng.rc /gprofng.rc
/group- /group-
/grub.d/ /grub.d/
@ -69,6 +69,7 @@
/protocols /protocols
/resolv.conf /resolv.conf
/rpc /rpc
/rsyncd.conf
/screenrc /screenrc
/securetty /securetty
/security/ /security/

6
etc/apache/httpd.conf
View file

@ -305,9 +305,9 @@ DirectoryIndex disabled
</Directory> </Directory>
</IfModule> </IfModule>
<Directory /data/www/html> <Directory /data/var/www/html>
Options Includes MultiViews SymLinksIfOwnerMatch Options Includes MultiViews SymLinksIfOwnerMatch
AllowOverride AuthConfig FileInfo Indexes Limit AllowOverride AuthConfig FileInfo Indexes Limit Options
Require all granted Require all granted
@ -336,7 +336,7 @@ DirectoryIndex disabled
</Directory> </Directory>
<IfModule cgid_module> <IfModule cgid_module>
<Directory /data/www/cgi-bin/> <Directory /data/var/www/cgi-bin/>
Options ExecCGI Includes MultiViews SymLinksIfOwnerMatch Options ExecCGI Includes MultiViews SymLinksIfOwnerMatch
AllowOverride AuthConfig FileInfo Limit AllowOverride AuthConfig FileInfo Limit

20
etc/apache/sites.d/_default_.conf
View file

@ -55,11 +55,11 @@
RedirectMatch permanent ^/(?!(\.well-known|httpd-errordocs)/)(.*) https://afterdark.org.uk/$2 RedirectMatch permanent ^/(?!(\.well-known|httpd-errordocs)/)(.*) https://afterdark.org.uk/$2
</IfModule> </IfModule>
<IfModule !ssl_module> <IfModule !ssl_module>
ScriptAlias /cgi-bin/ /data/www/cgi-bin/ ScriptAlias /cgi-bin/ /data/var/www/cgi-bin/
DocumentRoot /data/www/html/ DocumentRoot /data/var/www/html/
CustomLog /data/www/logs/httpd-access VHostCombined env=!no_log CustomLog /data/var/www/logs/httpd-access VHostCombined env=!no_log
<Proxy *> <Proxy *>
Require all granted Require all granted
@ -67,8 +67,8 @@
# Do NOT add backslashes to the end of the urls. # Do NOT add backslashes to the end of the urls.
ProxyPass /git http://127.0.0.1:9100 ProxyPass /git http://127.0.0.1:9100
ProxyPassReverse /git http://127.0.0.1:9100 ProxyPassReverse /git http://127.0.0.1:9100
ProxyPass /terrastate http://127.0.0.1:9200 ProxyPass /ts http://127.0.0.1:9200
ProxyPassReverse /terrastate http://127.0.0.1:9200 ProxyPassReverse /ts http://127.0.0.1:9200
<IfModule userdir_module> <IfModule userdir_module>
UserDir /data/home/*/www/html UserDir /data/home/*/www/html
@ -90,11 +90,11 @@
SetEnvIf REQUEST_URI ^/robots\.txt$ no_log SetEnvIf REQUEST_URI ^/robots\.txt$ no_log
SetEnvIf REQUEST_URI ^/favicon\.ico$ no_log SetEnvIf REQUEST_URI ^/favicon\.ico$ no_log
ScriptAlias /cgi-bin/ /data/www/cgi-bin/ ScriptAlias /cgi-bin/ /data/var/www/cgi-bin/
DocumentRoot /data/www/html/ DocumentRoot /data/var/www/html/
CustomLog /data/www/logs/httpd-access VHostCombined env=!no_log CustomLog /data/var/www/logs/httpd-access VHostCombined env=!no_log
<Proxy *> <Proxy *>
Require all granted Require all granted
@ -102,8 +102,8 @@
# Dot NOT add backslashes to the end of the urls. # Dot NOT add backslashes to the end of the urls.
ProxyPass /git http://127.0.0.1:9100 ProxyPass /git http://127.0.0.1:9100
ProxyPassReverse /git http://127.0.0.1:9100 ProxyPassReverse /git http://127.0.0.1:9100
ProxyPass /terrastate http://127.0.0.1:9200 ProxyPass /ts http://127.0.0.1:9200
ProxyPassReverse /terrastate http://127.0.0.1:9200 ProxyPassReverse /ts http://127.0.0.1:9200
<IfModule userdir_module> <IfModule userdir_module>
UserDir /data/home/*/www/html UserDir /data/home/*/www/html

4
etc/autofs/auto.storage
View file

@ -1,7 +1,5 @@
home -vers=4,hard,acl,rw,fsc 192.168.67.245:/home home -vers=4,hard,acl,rw,fsc 192.168.67.245:/home
media -vers=4,hard,acl,rw,fsc 192.168.67.245:/data/media media -vers=4,hard,acl,rw,fsc 192.168.67.245:/data/media
gitea -vers=4,hard,acl,rw,fsc 192.168.67.245:/data/gitea
gitroot -vers=4,hard,acl,rw,fsc 192.168.67.245:/data/gitroot
slackware -vers=4,hard,acl,rw,fsc 192.168.67.245:/data/slackware slackware -vers=4,hard,acl,rw,fsc 192.168.67.245:/data/slackware
tmp -vers=4,hard,acl,rw,fsc 192.168.67.245:/data/tmp tmp -vers=4,hard,acl,rw,fsc 192.168.67.245:/data/tmp
www -vers=4,hard,acl,rw,fsc 192.168.67.245:/data/www var -vers=4,hard,acl,rw,fsc 192.168.67.245:/data/var

1
etc/cron.daily/cronjob-dehdrated
View file

@ -1 +0,0 @@
/opt/bin/cronjob-dehdrated

1
etc/cron.daily/cronjob-dehydrated Symbolic link
View file

@ -0,0 +1 @@
/opt/bin/cronjob-dehydrated

7
etc/default/terraform-http-backend Normal file
View file

@ -0,0 +1,7 @@
# Note: must include / on the end!
export TF_STORAGE_DIR=/data/var/terraform-http-backend/
export TF_AUTH_ENABLED=false
# export TF_USERNAME=admin
# export TF_PASSWORD=admin
export TF_PORT=9200
export TF_IP=127.0.0.1

BIN
etc/forgejo.conf.gpg Normal file
View file

Binary file not shown.

BIN
etc/gitea.conf.gpg
View file

Binary file not shown.

4
etc/group
View file

@ -34,5 +34,5 @@ ntpd:x:997:
rpc:x:996: rpc:x:996:
_mlocate:x:995: _mlocate:x:995:
_apache:x:994: _apache:x:994:
_gitea:x:993: _forgejo:x:993:
_terrastate:x:992: _ts:x:992:

4
etc/gshadow.gpg
View file

@ -1,3 +1 @@
Œ  b§cù¡$ òÒÀ>B¤ýî0‚~J˜:ߟâX…½ÿ\M¼ Û3Vø½-°34ùŒúU…%‰8œ–=§ðßYÑ¥ñáøèj*Y¿£gÓïІW÷µOšâIõq0Y'rÄA<ý£Ý*m§bÓ:…^HÑ <EFBFBD>  c»¿”ת בעְׂ>Dב-<2D>פ8<D7A4>צ]ֵב¬¸ך<C2B8>ֳ<>ְ <09>₪zd*‡<><E280A1>ִ•<D6B4>ע”·^y0<>?A׀k<D780>לוּ°°ב'o”ֱs­ֹb·Bc1k2jֶ‎ם†חT'PV¥w×o%]¯"ָ׀¼0+Hֻ,G/;9¡‏<C2A1>`R±שב0ׂT2>{"<22>¯׃o]כ#אח¡<D797>×¹3Pד-<2D>ֻKזֳk<D6B3>°<EFBFBD>bµrM«¨<C2AB>ֶ/·ׂ<C2B7>ֻF£?MW]<5D>µ!ֿקכ<D7A7>T<05><0’D(לVh¾<68>E£‰<C2A3>TPY:!דו¼z´‎<C2B4>7{!׃·<D783>gזתֽ¼ <20>³הC¼Q^<5E>»Wַ€ּעסL<12>)­ײs’0<E28099>]<5D><>*
è+<Ÿeñ‹ZUÿ¬‰Yß²Æ듪”<C2AA>k‰ëСv#Y3¿Ì^Ær}æe¸z # ‘
ES9,‡ÿÄv¦½çûJð¬sæ¢WÇš`š=<3D>dÓè#—Á]osœÔ]ä.qÀP’RÌ{û·Çv—õH²×A^ðÖvsŽ*ç4ÇgümêÝÑŸàð…=

4
etc/passwd
View file

@ -7,5 +7,5 @@ ntpd:x:997:997:ntpd unprivileged user:/var/db/ntpd:/sbin/nologin
rpc:x:996:996:rpc unprivileged user:/var/empty:/sbin/nologin rpc:x:996:996:rpc unprivileged user:/var/empty:/sbin/nologin
_mlocate:x:995:995:_mlocate unprivileged user:/var/empty:/sbin/nologin _mlocate:x:995:995:_mlocate unprivileged user:/var/empty:/sbin/nologin
_apache:x:994:994:_apache unprivileged user:/srv/www/apache:/sbin/nologin _apache:x:994:994:_apache unprivileged user:/srv/www/apache:/sbin/nologin
_gitea:x:993:993:_gitea unprivileged user:/var/lib/gitea:/bin/bash _forgejo:x:993:993:_forgejo unprivileged user:/var/lib/forgejo:/bin/bash
_terrastate:x:992:992:_terrastate unprivileged user:/var/lib/terrastate:/sbin/nologin _ts:x:992:992:_ts unprivileged user:/var/lib/ts:/bin/bash

1
etc/php8.2/.gitignore vendored
View file

@ -1 +0,0 @@
*.default

1
etc/php8.3/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/*.orig

0
etc/php8.2/php-fpm.conf → etc/php8.3/php-fpm.conf
View file

1
etc/php8.3/php-fpm.d/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/*.orig

0
etc/php8.2/php-fpm.d/www.conf → etc/php8.3/php-fpm.d/www.conf
View file

0
etc/php8.2/php.ini → etc/php8.3/php.ini
View file

43
etc/pkglist
View file

@ -21,6 +21,9 @@ bash
bc bc
bind-libs bind-libs
bind-utils bind-utils
binutils
binutils-doc
binutils-libs
brltty brltty
brotli brotli
btrfs-progs btrfs-progs
@ -67,7 +70,7 @@ gawk
gdbm gdbm
gdk-pixbuf gdk-pixbuf
git git
gitea git-lfs
glib glib
glibc glibc
glibc-locales glibc-locales
@ -75,6 +78,7 @@ glibmm
gmp gmp
gnupg gnupg
gnutls gnutls
go
graphite graphite
grep grep
grub grub
@ -131,8 +135,10 @@ libargon2
libaspell libaspell
libassuan libassuan
libasyncns libasyncns
libatomic
libblkid libblkid
libbluetooth libbluetooth
libbpf
libcap libcap
libcap-ng libcap-ng
libcap-progs libcap-progs
@ -143,6 +149,7 @@ libcups
libcurl libcurl
libdatrie libdatrie
libdb libdb
libdebuginfod
libdrm libdrm
libedit libedit
libefivar libefivar
@ -172,6 +179,7 @@ libjpeg-turbo
libkeyutils libkeyutils
libkmod libkmod
libksba libksba
liblastlog2
libldap libldap
libldns libldns
libltdl libltdl
@ -197,6 +205,7 @@ libpciaccess
libpcre libpcre
libpcre2 libpcre2
libpng libpng
libpsl
libpulseaudio libpulseaudio
libreadline8 libreadline8
librsvg librsvg
@ -230,6 +239,9 @@ libvoikko
libvorbis libvorbis
libxbps libxbps
libxcb libxcb
libxcrypt
libxcrypt-compat
libxcrypt-devel
libxkbcommon libxkbcommon
libxkbfile libxkbfile
libxml2 libxml2
@ -245,9 +257,11 @@ linux-firmware-intel
linux-firmware-network linux-firmware-network
linux-firmware-nvidia linux-firmware-nvidia
linux6.5 linux6.5
linux6.6
logrotate logrotate
lowdown lowdown
lsof lsof
lua54
lvm2 lvm2
lynx lynx
lzo lzo
@ -313,24 +327,25 @@ php-snmp
php-sqlite php-sqlite
php-tidy php-tidy
php-xsl php-xsl
php8.2 php8.3
php8.2-cgi php8.3-cgi
php8.2-enchant php8.3-enchant
php8.2-fpm php8.3-fpm
php8.2-intl php8.3-intl
php8.2-ldap php8.3-ldap
php8.2-mysql php8.3-mysql
php8.2-odbc php8.3-odbc
php8.2-snmp php8.3-snmp
php8.2-sqlite php8.3-sqlite
php8.2-tidy php8.3-tidy
php8.2-xsl php8.3-xsl
pick pick
pinentry pinentry
pinfo pinfo
pixman pixman
popt popt
procps-ng procps-ng
public-suffix
python3 python3
python3-pip python3-pip
python3-setuptools python3-setuptools
@ -352,6 +367,8 @@ sqlite
sshguard sshguard
sudo sudo
tar tar
terraform
tflint
thin-provisioning-tools thin-provisioning-tools
tiff tiff
traceroute traceroute

1
etc/runit/runsvdir/default/forgejo Symbolic link
View file

@ -0,0 +1 @@
/etc/sv/forgejo

1
etc/runit/runsvdir/default/gitea
View file

@ -1 +0,0 @@
/etc/sv/gitea

1
etc/runit/runsvdir/default/php-fpm8.2
View file

@ -1 +0,0 @@
/etc/sv/php-fpm8.2

1
etc/runit/runsvdir/default/php-fpm8.3 Symbolic link
View file

@ -0,0 +1 @@
/etc/sv/php-fpm8.3

1
etc/runit/runsvdir/default/terraform-http-backend Symbolic link
View file

@ -0,0 +1 @@
/etc/sv/terraform-http-backend

1
etc/runit/shutdown.d/75-force-unmounts.sh
View file

@ -1 +0,0 @@
umount -f -r -a -t nosysfs,noproc,nodevtmpfs,notmpfs

5
etc/runit/shutdown.d/75-unmount-remote.sh Normal file
View file

@ -0,0 +1,5 @@
msg "Unmounting remote filesystems..."
sync
umount -l -r -t nfs,nfs4

BIN
etc/shadow.gpg
View file

Binary file not shown.

2
etc/sv/.gitignore vendored
View file

@ -32,7 +32,7 @@
/mdadm/ /mdadm/
/nfs-server/ /nfs-server/
/ntpd /ntpd
/php-fpm8.2/ /php-fpm8.3/
/rpcbind/ /rpcbind/
/rpcblkmapd/ /rpcblkmapd/
/rpcgssd/ /rpcgssd/

1
etc/sv/forgejo/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/supervise

1
etc/sv/forgejo/log/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/supervise

2
etc/sv/forgejo/log/run Executable file
View file

@ -0,0 +1,2 @@
#!/bin/sh
exec vlogger -t forgejo -p daemon

13
etc/sv/forgejo/run Executable file
View file

@ -0,0 +1,13 @@
#!/bin/sh
exec 2>&1
# USER and HOME are needed because gitea doesn't actually check the user it
# runs as, but instead just grabs the variables from the variables.
export USER=_forgejo
export HOME=/data/var/forgejo
# gitea needs to run from its home for SSH to work properly
export GITEA_WORK_DIR="${HOME}"
cd "${HOME}"
exec chpst -u _forgejo:_forgejo /opt/bin/forgejo web --config /etc/forgejo.conf 2>&1

1
etc/sv/terraform-http-backend/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/supervise

1
etc/sv/terraform-http-backend/conf Symbolic link
View file

@ -0,0 +1 @@
/etc/default/terraform-http-backend

1
etc/sv/terraform-http-backend/log/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/supervise

2
etc/sv/terraform-http-backend/log/run Executable file
View file

@ -0,0 +1,2 @@
#!/bin/sh
exec vlogger -t terraform-http-backend -p daemon

4
etc/sv/terraform-http-backend/run Executable file
View file

@ -0,0 +1,4 @@
#!/bin/sh
exec 2>&1
[ -r conf ] && . ./conf
exec chpst -u _ts:_ts /opt/bin/terraform-http-backend 2>&1