fix and update scripts

README.md

@@ -20,4 +20,11 @@ and then run the script again. It will skip all successfully completed checkpoin
 See `scripts/template` for an example.
 
 ## Unattended?
+
 Not really, but most steps should be automatic
+
+## Fully rerun a script
+
+Remove run.checkpoints from the script root directory. This will reset the script's idempotency check.
+It is just a text file with names of checkpoints that have successfully completed. You can edit it to
+skip certain parts, or replay them.

run.sh

@@ -21,7 +21,7 @@ for var in "$@"; do
     else
         TEMP_OUT=$(mktemp);
         chmod a-rwx,u+rw "$TEMP_OUT";
-        echo -n "scripts/base... ";
+        echo -n "scripts/$var... ";
 
         OK=0
         echo "" | bash script.sh > "$TEMP_OUT" 2>&1 || OK=1;

scripts/dsnet/dsnet.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=dsnet
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/dsnet up
+ExecStop=/usr/bin/dsnet down
+RemainAfterExit=yes
+ExecReload=/usr/bin/dsnet sync
+
+[Install]
+WantedBy=default.target

scripts/dsnet/script.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+set -euo pipefail
+
+source "$HL_LIB"
+
+_assert_vars HL_TIMEZONE HL_DOMAIN;
+
+_ch_001-install_wireguard() {
+    sudo apt-get install -y wireguard;
+}
+
+_ch_002-install_dsnet() {
+    sudo curl -L https://github.com/naggie/dsnet/releases/latest/download/dsnet-linux-amd64 -o /usr/bin/dsnet
+    sudo chmod +x /usr/bin/dsnet
+}
+
+_ch_003-init_dsnet() {
+    sudo dsnet init
+
+    # copy the fresh config if there isn't one already
+    [ -f /data/dsnetconfig.json ] || sudo cp /etc/dsnetconfig.json /data/dsnetconfig.json
+
+    sudo rm /etc/dsnetconfig.json
+    sudo ln -s /data/dsnetconfig.json /etc/dsnetconfig.json
+}
+
+_ch_004-install_service() {
+    sudo cp dsnet.service /etc/systemd/system/dsnet.service
+    sudo systemctl daemon-reload
+}
+
+_ch_005-enable_ip_forwarding() {
+    sudo sysctl -w net.ipv4.ip_forward=1
+    sudo sysctl -w net.ipv6.conf.all.forwarding=1
+    echo "net.ipv4.ip_forward=1" | sudo tee -a /etc/sysctl.conf
+    echo "net.ipv6.conf.all.forwarding=1" | sudo tee -a /etc/sysctl.conf
+}
+
+_ch_006-run_service() {
+    sudo systemctl enable --now dsnet.service
+}
+
+_run_checkpoints

scripts/jellyfin/docker-compose.yml.templ

@@ -2,7 +2,6 @@ version: '3.5'
 services:
   jellyfin:
     image: jellyfin/jellyfin
-    user: 1000:1000
     container_name: jellyfin
     ports:
       - 127.0.0.1:8096:8096

scripts/monitoring/script.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+# Template script not meant to be run
+set -euo pipefail
+
+source "$HL_LIB"
+
+_ch_001-install_pip() {
+    sudo apt-get install -y python3-pip
+}
+
+_ch_002-install_monitoring() {
+    git clone git://git.bain.cz/monitor.git ~/monitoring;
+    cd ~/monitoring;
+    python3 -m pip install -r requirements.txt
+}
+
+_ch_003-create_ssh_identity() {
+    pushd ~/monitoring;
+    ssh-keygen -t ed25519 -N "" -f id_status-repo
+    popd;
+
+    echo "_ch_003-create_ssh_identity" >> run.checkpoints
+    _err "please upload the new SSH identity at ~/monitoring/id_status-repo.pub to github, then restart"
+}
+
+_ch_004-clone_status_repo() {
+    cd ~/monitoring;
+    git clone --config "core.sshCommand=ssh -i ~/monitoring/id_status-repo" git@github.com:bain3/status.git status-repo
+}
+
+_ch_005-install_crontab() {
+    echo "*/5 * * * * $USER cd /home/$USER/monitoring && python3 monitor.py >> log.log 2>&1" | sudo tee /etc/cron.d/$USER-monitor
+}
+
+_run_checkpoints

scripts/smbshare/script.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+# Template script not meant to be run
+set -euo pipefail;
+
+source "$HL_LIB";
+
+_ch_001-install_deps() {
+    sudo apt-get install -y samba avahi-daemon;
+}
+
+_ch_002-create_user() {
+    sudo useradd --system --shell /usr/sbin/nologin abmas;
+}
+
+_ch_003-create_and_chmod_root() {
+    mkdir -p /data/smbshare;
+    sudo chown -R abmas /data/smbshare;
+}
+
+_ch_004-configure_smbd() {
+    cat smb.conf | sudo tee /etc/samba/smb.conf
+    sudo systemctl reload smbd.service
+}
+
+_run_checkpoints;

scripts/smbshare/smb.conf

@@ -0,0 +1,252 @@
+#
+# Sample configuration file for the Samba suite for Debian GNU/Linux.
+#
+#
+# This is the main Samba configuration file. You should read the
+# smb.conf(5) manual page in order to understand the options listed
+# here. Samba has a huge number of configurable options most of which 
+# are not shown in this example
+#
+# Some options that are often worth tuning have been included as
+# commented-out examples in this file.
+#  - When such options are commented with ";", the proposed setting
+#    differs from the default Samba behaviour
+#  - When commented with "#", the proposed setting is the default
+#    behaviour of Samba but the option is considered important
+#    enough to be mentioned here
+#
+# NOTE: Whenever you modify this file you should run the command
+# "testparm" to check that you have not made any basic syntactic 
+# errors. 
+
+#======================= Global Settings =======================
+
+[global]
+
+## Browsing/Identification ###
+
+# Change this to the workgroup/NT-domain name your Samba server will part of
+   workgroup = WORKGROUP
+
+# server string is the equivalent of the NT Description field
+   server string = %h
+
+#### Networking ####
+
+# The specific set of interfaces / networks to bind to
+# This can be either the interface name or an IP address/netmask;
+# interface names are normally preferred
+;   interfaces = 127.0.0.0/8 eth0
+
+# Only bind to the named interfaces and/or networks; you must use the
+# 'interfaces' option above to use this.
+# It is recommended that you enable this feature if your Samba machine is
+# not protected by a firewall or is a firewall itself.  However, this
+# option cannot handle dynamic or non-broadcast interfaces correctly.
+;   bind interfaces only = yes
+
+
+
+#### Debugging/Accounting ####
+
+# This tells Samba to use a separate log file for each machine
+# that connects
+   log file = /var/log/samba/log.%m
+
+# Cap the size of the individual log files (in KiB).
+   max log size = 1000
+
+# We want Samba to only log to /var/log/samba/log.{smbd,nmbd}.
+# Append syslog@1 if you want important messages to be sent to syslog too.
+   logging = file
+
+# Do something sensible when Samba crashes: mail the admin a backtrace
+   panic action = /usr/share/samba/panic-action %d
+
+
+####### Authentication #######
+
+# Server role. Defines in which mode Samba will operate. Possible
+# values are "standalone server", "member server", "classic primary
+# domain controller", "classic backup domain controller", "active
+# directory domain controller". 
+#
+# Most people will want "standalone server" or "member server".
+# Running as "active directory domain controller" will require first
+# running "samba-tool domain provision" to wipe databases and create a
+# new domain.
+   server role = standalone server
+
+   obey pam restrictions = yes
+
+# This boolean parameter controls whether Samba attempts to sync the Unix
+# password with the SMB password when the encrypted SMB password in the
+# passdb is changed.
+   unix password sync = yes
+
+# For Unix password sync to work on a Debian GNU/Linux system, the following
+# parameters must be set (thanks to Ian Kahan <<kahan@informatik.tu-muenchen.de> for
+# sending the correct chat script for the passwd program in Debian Sarge).
+   passwd program = /usr/bin/passwd %u
+   passwd chat = *Enter\snew\s*\spassword:* %n\n *Retype\snew\s*\spassword:* %n\n *password\supdated\ssuccessfully* .
+
+# This boolean controls whether PAM will be used for password changes
+# when requested by an SMB client instead of the program listed in
+# 'passwd program'. The default is 'no'.
+   pam password change = yes
+
+# This option controls how unsuccessful authentication attempts are mapped
+# to anonymous connections
+   map to guest = Bad User
+
+   guest account = nobody
+
+########## Domains ###########
+
+#
+# The following settings only takes effect if 'server role = classic
+# primary domain controller', 'server role = classic backup domain controller'
+# or 'domain logons' is set 
+#
+
+# It specifies the location of the user's
+# profile directory from the client point of view) The following
+# required a [profiles] share to be setup on the samba server (see
+# below)
+;   logon path = \\%N\profiles\%U
+# Another common choice is storing the profile in the user's home directory
+# (this is Samba's default)
+#   logon path = \\%N\%U\profile
+
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the location of a user's home directory (from the client
+# point of view)
+;   logon drive = H:
+#   logon home = \\%N\%U
+
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the script to run during logon. The script must be stored
+# in the [netlogon] share
+# NOTE: Must be store in 'DOS' file format convention
+;   logon script = logon.cmd
+
+# This allows Unix users to be created on the domain controller via the SAMR
+# RPC pipe.  The example command creates a user account with a disabled Unix
+# password; please adapt to your needs
+; add user script = /usr/sbin/adduser --quiet --disabled-password --gecos "" %u
+
+# This allows machine accounts to be created on the domain controller via the 
+# SAMR RPC pipe.  
+# The following assumes a "machines" group exists on the system
+; add machine script  = /usr/sbin/useradd -g machines -c "%u machine account" -d /var/lib/samba -s /bin/false %u
+
+# This allows Unix groups to be created on the domain controller via the SAMR
+# RPC pipe.  
+; add group script = /usr/sbin/addgroup --force-badname %g
+
+############ Misc ############
+
+# Using the following line enables you to customise your configuration
+# on a per machine basis. The %m gets replaced with the netbios name
+# of the machine that is connecting
+;   include = /home/samba/etc/smb.conf.%m
+
+# Some defaults for winbind (make sure you're not using the ranges
+# for something else.)
+;   idmap config * :              backend = tdb
+;   idmap config * :              range   = 3000-7999
+;   idmap config YOURDOMAINHERE : backend = tdb
+;   idmap config YOURDOMAINHERE : range   = 100000-999999
+;   template shell = /bin/bash
+
+# Setup usershare options to enable non-root users to share folders
+# with the net usershare command.
+
+# Maximum number of usershare. 0 means that usershare is disabled.
+#   usershare max shares = 100
+
+# Allow users who've been granted usershare privileges to create
+# public shares, not just authenticated ones
+   usershare allow guests = yes
+
+#======================= Share Definitions =======================
+
+# Un-comment the following (and tweak the other settings below to suit)
+# to enable the default home directory shares. This will share each
+# user's home directory as \\server\username
+;[homes]
+;   comment = Home Directories
+;   browseable = no
+
+# By default, the home directories are exported read-only. Change the
+# next parameter to 'no' if you want to be able to write to them.
+;   read only = yes
+
+# File creation mask is set to 0700 for security reasons. If you want to
+# create files with group=rw permissions, set next parameter to 0775.
+;   create mask = 0700
+
+# Directory creation mask is set to 0700 for security reasons. If you want to
+# create dirs. with group=rw permissions, set next parameter to 0775.
+;   directory mask = 0700
+
+# By default, \\server\username shares can be connected to by anyone
+# with access to the samba server.
+# Un-comment the following parameter to make sure that only "username"
+# can connect to \\server\username
+# This might need tweaking when using external authentication schemes
+;   valid users = %S
+
+# Un-comment the following and create the netlogon directory for Domain Logons
+# (you need to configure Samba to act as a domain controller too.)
+;[netlogon]
+;   comment = Network Logon Service
+;   path = /home/samba/netlogon
+;   guest ok = yes
+;   read only = yes
+
+# Un-comment the following and create the profiles directory to store
+# users profiles (see the "logon path" option above)
+# (you need to configure Samba to act as a domain controller too.)
+# The path below should be writable by all users so that their
+# profile directory may be created the first time they log on
+;[profiles]
+;   comment = Users profiles
+;   path = /home/samba/profiles
+;   guest ok = no
+;   browseable = no
+;   create mask = 0600
+;   directory mask = 0700
+
+#[printers]
+#   comment = All Printers
+#   browseable = no
+#   path = /var/spool/samba
+#   printable = yes
+#   guest ok = no
+#   read only = yes
+#   create mask = 0700
+
+# Windows clients look for this share name as a source of downloadable
+# printer drivers
+#[print$]
+#   comment = Printer Drivers
+#   path = /var/lib/samba/printers
+#   browseable = yes
+#   read only = yes
+#   guest ok = no
+# Uncomment to allow remote administration of Windows print drivers.
+# You may need to replace 'lpadmin' with the name of the group your
+# admin users are members of.
+# Please note that you also need to set appropriate Unix permissions
+# to the drivers directory for these users to have write rights in it
+;   write list = root, @lpadmin
+
+[share]
+   comment = public samba share
+   path = /data/smbshare
+   available = yes
+   browsable = yes
+   writable = yes
+   guest ok = yes
+   force user = abmas

scripts/template/script.sh

@@ -10,4 +10,12 @@ _ch_001-cat_filled_greeting() {
     cat $(_fill greeting.templ);
 }
 
+# You can do anything inside the function. Just don't popd without pushd first.
+# Exitting will of course exit the whole script, use return if you want to
+# just exit from a checkpoint. Returning something non-zero will fail the checkpoint,
+# so it will be ran the next time it is called.
+_ch_002-test_cd_safe() {
+    cd ~;
+}
+
 _run_checkpoints