commit 8327e7db672f8552eb8bb21f1e818624d5d77a18
parent f10236537953a1c087cb8aa7a0668148acb47fba
author: nathanael <nathanael@dalliard.ch>
date: Sat, 18 Oct 2025 05:55:33 +0000
s0: remove s6
diffstat:
14 files changed, 0 insertions(+), 224 deletions(-)
diff --git a/s6/dotfiles/shrc.local b/s6/dotfiles/shrc.local
@@ -1 +0,0 @@
-h() { tmux new -DAs s6; }
diff --git a/s6/makefile b/s6/makefile
@@ -1,16 +0,0 @@
-HOST != hostname
-EXP = s6.dalliard.ch
-
-deploy: dots sys pkg
-
-host:
- @[ "$(HOST)" = "$(EXP)" ]
-
-dots: host
- @./scripts/dotfiles.sh
-
-sys: host
- @./scripts/sysfiles.sh
-
-pkg: host
- @doas pkg_add -l packages >/dev/null
diff --git a/s6/packages b/s6/packages
@@ -1,3 +0,0 @@
-git--
-got--
-sysclean--
diff --git a/s6/scripts/dotfiles.sh b/s6/scripts/dotfiles.sh
@@ -1,13 +0,0 @@
-#!/bin/sh
-src="$HOME/src/src"
-
-ln -fsh "$HOME/prv/ssh" "$HOME/.ssh"
-
-ln -fs "$src/s0/dotfiles/exrc" "$HOME/.exrc"
-ln -fs "$src/s0/dotfiles/profile" "$HOME/.profile"
-ln -fs "$src/s0/dotfiles/shrc" "$HOME/.shrc"
-ln -fs "$src/s1/dotfiles/exrc.local" "$HOME/.exrc.local"
-ln -fs "$src/s1/dotfiles/hushlogin" "$HOME/.hushlogin"
-ln -fs "$src/s1/dotfiles/profile.local" "$HOME/.profile.local"
-ln -fs "$src/s1/dotfiles/tmux.conf" "$HOME/.tmux.conf"
-ln -fs "$src/s6/dotfiles/shrc.local" "$HOME/.shrc.local"
diff --git a/s6/scripts/sysfiles.sh b/s6/scripts/sysfiles.sh
@@ -1,13 +0,0 @@
-#!/bin/sh
-src="$HOME/src/src"
-
-doas install -o root -g wheel -m 600 "$src/s1/sysfiles/pf.conf" "/etc/pf.conf"
-
-doas install -o root -g wheel -m 600 "$src/s6/sysfiles/relayd.conf" "/etc/relayd.conf"
-doas install -o root -g wheel -m 640 "$src/s6/sysfiles/doas.conf" "/etc/doas.conf"
-doas install -o root -g wheel -m 644 "$src/s6/sysfiles/acme-client.conf" "/etc/acme-client.conf"
-doas install -o root -g wheel -m 644 "$src/s6/sysfiles/aliases" "/etc/mail/aliases"
-doas install -o root -g wheel -m 644 "$src/s6/sysfiles/httpd.conf" "/etc/httpd.conf"
-doas install -o root -g wheel -m 644 "$src/s6/sysfiles/sysclean" "/etc/sysclean.ignore"
-doas install -o root -g wheel -m 644 "$src/s6/sysfiles/weekly.local" "/etc/weekly.local"
-doas install -o root -g www -m 644 "$src/s6/sysfiles/index.html" "/var/www/htdocs/index.html"
diff --git a/s6/sysfiles/acme-client.conf b/s6/sysfiles/acme-client.conf
@@ -1,10 +0,0 @@
-authority letsencrypt {
- api url "https://acme-v02.api.letsencrypt.org/directory"
- account key "/etc/acme/letsencrypt-privkey.pem"
-}
-
-domain s6.dalliard.ch {
- domain key "/etc/ssl/private/s6.dalliard.ch.key"
- domain full chain certificate "/etc/ssl/s6.dalliard.ch.crt"
- sign with letsencrypt
-}
diff --git a/s6/sysfiles/aliases b/s6/sysfiles/aliases
@@ -1,103 +0,0 @@
-#
-# $OpenBSD: aliases,v 1.70 2022/06/28 18:46:01 claudio Exp $
-#
-# Aliases in this file will NOT be expanded in the header from
-# Mail, but WILL be visible over networks or from /usr/libexec/mail.local.
-#
-# >>>>>>>>>> The program "newaliases" must be run after
-# >> NOTE >> this file is updated for any changes to
-# >>>>>>>>>> show through to smtpd.
-#
-
-# Basic system aliases -- these MUST be present
-MAILER-DAEMON: postmaster
-postmaster: root
-
-# General redirections for important pseudo accounts
-daemon: root
-ftp-bugs: root
-operator: root
-www: root
-
-# Redirections for pseudo accounts that should not receive mail
-_bgpd: /dev/null
-_bgplgd: /dev/null
-_dhcp: /dev/null
-_dpb: /dev/null
-_dvmrpd: /dev/null
-_eigrpd: /dev/null
-_file: /dev/null
-_fingerd: /dev/null
-_ftp: /dev/null
-_hostapd: /dev/null
-_identd: /dev/null
-_iked: /dev/null
-_isakmpd: /dev/null
-_iscsid: /dev/null
-_ldapd: /dev/null
-_ldpd: /dev/null
-_mopd: /dev/null
-_nsd: /dev/null
-_ntp: /dev/null
-_ospfd: /dev/null
-_ospf6d: /dev/null
-_pbuild: /dev/null
-_pfetch: /dev/null
-_pflogd: /dev/null
-_ping: /dev/null
-_pkgfetch: /dev/null
-_pkguntar: /dev/null
-_portmap: /dev/null
-_ppp: /dev/null
-_rad: /dev/null
-_radiusd: /dev/null
-_rbootd: /dev/null
-_relayd: /dev/null
-_ripd: /dev/null
-_rstatd: /dev/null
-_rusersd: /dev/null
-_rwalld: /dev/null
-_smtpd: /dev/null
-_smtpq: /dev/null
-_sndio: /dev/null
-_snmpd: /dev/null
-_spamd: /dev/null
-_syslogd: /dev/null
-_tcpdump: /dev/null
-_traceroute: /dev/null
-_tftpd: /dev/null
-_unbound: /dev/null
-_unwind: /dev/null
-_vmd: /dev/null
-_x11: /dev/null
-_ypldap: /dev/null
-bin: /dev/null
-build: /dev/null
-nobody: /dev/null
-_tftp_proxy: /dev/null
-_ftp_proxy: /dev/null
-_sndiop: /dev/null
-_syspatch: /dev/null
-_slaacd: /dev/null
-sshd: /dev/null
-
-# Well-known aliases -- these should be filled in!
-root: nathanael
-manager: root
-dumper: root
-
-# RFC 2142: NETWORK OPERATIONS MAILBOX NAMES
-abuse: root
-# noc: root
-security: root
-
-# RFC 2142: SUPPORT MAILBOX NAMES FOR SPECIFIC INTERNET SERVICES
-# hostmaster: root
-# usenet: root
-# news: usenet
-# webmaster: root
-# ftp: root
-
-nathanael: nathanael@dalliard.ch
-
-_pfbadhost: root
diff --git a/s6/sysfiles/doas.conf b/s6/sysfiles/doas.conf
@@ -1 +0,0 @@
-permit nopass :wheel
diff --git a/s6/sysfiles/httpd.conf b/s6/sysfiles/httpd.conf
@@ -1,15 +0,0 @@
-server "http" {
- listen on egress port http
- location "/.well-known/acme-challenge/*" {
- root "/acme"
- request strip 2
- }
- location * {
- block return 301 "https://$HTTP_HOST$REQUEST_URI"
- }
- no log
-}
-server "https" {
- listen on lo port https
- no log
-}
diff --git a/s6/sysfiles/index.html b/s6/sysfiles/index.html
@@ -1,16 +0,0 @@
-<!doctype html>
-<html lang="en">
-<link rel="icon" href="data:,">
-<meta charset="utf-8">
-<meta name="color-scheme" content="dark light">
-<meta name="viewport" content="width=device-width,initial-scale=1">
-<title>s6.dalliard.ch</title>
-<pre>
- ________
- ______/ _____/
- / ___/ __ \
- \___ \\ |__\ \
-/____ >\_____ /
- \/ \/
- <a href="https://dalliard.ch">dalliard.ch</a>
-</pre>
diff --git a/s6/sysfiles/motd b/s6/sysfiles/motd
@@ -1,9 +0,0 @@
-OpenBSD 7.7 (GENERIC) #2: Sun Jun 29 09:03:32 MDT 2025
- ________
- ______/ _____/
- / ___/ __ \
- \___ \\ |__\ \
-/____ >\_____ /
- \/ \/
- s6.dalliard.ch
-
diff --git a/s6/sysfiles/relayd.conf b/s6/sysfiles/relayd.conf
@@ -1,19 +0,0 @@
-ipv6="2a13:e3c1:400e:1337::666"
-table <httpd> { 127.0.0.1 }
-http protocol https {
- tls { no tlsv1.0, tlsv1.1, ciphers "ECDHE+AESGCM:ECDHE+CHACHA20:!aNULL:!MD5:!DSS" }
- tls keypair "s6.dalliard.ch"
-
- match response header set "Strict-Transport-Security" \
- value "max-age=63072000; includeSubDomains"
- match response header set "X-Content-Type-Options" value "nosniff"
- match response header set "X-Frame-Options" value "deny"
- match response header set "Referrer-Policy" value "no-referrer"
- match response header set "Content-Security-Policy" value \
- "default-src 'self'; base-uri 'none'; img-src 'self' data:; form-action 'none'; frame-ancestors 'none'"
-}
-relay wwwtls6 {
- listen on $ipv6 port https tls
- protocol https
- forward to <httpd> port https
-}
diff --git a/s6/sysfiles/sysclean b/s6/sysfiles/sysclean
@@ -1,4 +0,0 @@
-/etc/ssl/private/s6.dalliard.ch.key
-/etc/ssl/s6.dalliard.ch.crt
-/etc/ssl/s6.dalliard.ch.crt.1
-/var/got
diff --git a/s6/sysfiles/weekly.local b/s6/sysfiles/weekly.local
@@ -1 +0,0 @@
-/usr/sbin/acme-client s6.dalliard.ch && /usr/sbin/rcctl reload relayd >/dev/null
