make radicale setup vpned

[distro-setup] / distro-end

diff --git a/distro-end b/distro-end
index 2317edd9df5c46e607d6204c8f8d6a48805ce279..dde7a1026206449daf0f6affa9828b9424e3e84d 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -299,6 +299,24 @@ EOF
         acme-tiny-wrapper mail.iankelling.org
         sgo openvpn
         tu /etc/hosts <<<"10.8.0.4 mail.iankelling.org"
+        domain=cal.iankelling.org
+        acme-tiny-wrapper $domain
+        apache-site -f 10.8.0.4:5232 - $domain <<'EOF'
+#https://httpd.apache.org/docs/2.4/mod/mod_authn_core.html#authtype
+        <Directory "/var/www/cal.iankelling.org/html">
+                Options +FollowSymLinks +Multiviews +Indexes
+                AllowOverride None
+                AuthType basic
+                AuthName "Authentication Required"
+                # setup one time, with root:www-data, 640
+                AuthUserFile "/etc/caldav-htpasswd"
+                Require valid-user
+        </Directory>
+EOF
+        # nginx version of above would be:
+        # auth_basic "Not currently available";
+        # auth_basic_user_file /etc/nginx/caldav/htpasswd;
+
 
 
         echo "$0: $(date): ending now)"
@@ -332,7 +350,7 @@ ser enable mailroute
 if [[ $HOSTNAME == treetowl ]]; then
     # note, this will need to be changed when the mail/contacts host changes
     sgo openvpn-client@mail
-    /a/bin/distro-setup/radicale-setup.sh
+    /a/bin/distro-setup/radicale-setup
 fi
 
 ## android studio setup
@@ -373,10 +391,12 @@ if [[ $HOSTNAME == treetowl ]]; then
             pi syncthing
             ;;
     esac
+    lnf -T /w/syncthing /home/ian/.config/syncthing
     sgo syncthing@ian # runs as ian
 
     # these things persist in ~/.config/syncthing, which I save in
-    # /p/c/machine_specific
+    # /w/syncthing (not in /p, because syncthing should continue to
+    # run on home server even when using laptop as primary device)
     # open http://localhost:8384/
     # change listen address from default to tcp://:22001,
     # this is because we do port forward so it doesn\'t have to use
@@ -452,7 +472,7 @@ EOF
             # it contains runtime data,
             # plus a simple symlink to the config file which it's
             # not worth separating out.
-            s lnf -T /q/transmission-daemon /var/lib/transmission-daemon/.config/transmission-daemon
+            s lnf -T /i/transmission-daemon /var/lib/transmission-daemon/.config/transmission-daemon
             #
             # config file documented here, and it's the same config
             # for daemon vs client, so it's documented in the gui.