various fixes

diff --git a/distro-end b/distro-end
index 8bedbc72868fca52b2ce5ca2819d6ee02f303929..534c17a5856691b20dc07bad6ddee92cb7fe667a 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -339,7 +339,7 @@ EOF
     "noweb":  false,
     "site":  "pump.iankelling.org",
     "owner":  "Ian Kelling",
-    "ownerURL":  "https://pump.iankelling.org/",
+    "ownerURL":  "https://iankelling.org/",
     "port":  8001,
     "urlPort": 443,
     "hostname":  "pump.iankelling.org",

diff --git a/mount-latest-subvol b/mount-latest-subvol
index a8ff06d0b96082cbc1779ac3d653cb6451d16430..c43bb587e150ff5de248f7cce52f8f76d95c12ca 100644 (file)
--- a/mount-latest-subvol
+++ b/mount-latest-subvol
@@ -85,14 +85,15 @@ case $HOSTNAME in
     treetowl|x2|frodo)
         tu /etc/fstab <<EOF
 $first_root_crypt  /q  btrfs  noatime,subvol=q  0 0
-$first_root_crypt  /m  btrfs  noatime,subvol=m  0 0
+$first_root_crypt  /o  btrfs  noatime,subvol=o  0 0
 /q/p  /p  none  bind  0 0
+/o/m  /m  none  bind  0 0
 EOF
         ;;
 esac
 ##### end setup fstab for subvols we care about ######
 
-for vol in q a m; do
+for vol in q a o; do
     d=/$vol
     if ! awk '{print $2}' /etc/fstab | grep -xF $d &>/dev/null; then
         continue

diff --git a/radicale-setup b/radicale-setup
index a2cbbd8163507bfc2e49e69ff8fe185c886fd7b2..631bf427fc691b1a15e5041e8e1491ced254bc94 100755 (executable)
--- a/radicale-setup
+++ b/radicale-setup
@@ -29,7 +29,6 @@ lnf -T /o/radicale /var/lib/radicale
 
 # coment in this file says this is needed for it to run on startup
 sed -ri 's/^\s*#+\s*(ENABLE_RADICALE\s*=\s*yes\s*)/\1/' /etc/default/radicale
-sgo radicale
 
 setini() {
     key="$1" value="$2" section="$3"
@@ -38,7 +37,8 @@ setini() {
 }
 
 # comments say default is 0.0.0.0:5232
-setini hosts 10.8.0.1:5232 server
+setini hosts 10.8.0.4:5232 server
+sgo radicale
 
 # davdroid from f-droid. username ian,
 # url https://iank.pw/radicale/ian.