From 6ce86e09372f3a83158fd121f23f8b24fc79b4ba Mon Sep 17 00:00:00 2001
From: Otho <otho@othoulrich.com>
Date: Sun, 25 Feb 2024 18:58:43 -0500
Subject: [PATCH] Minor fixed.

---
 README.md                  | 23 +++++++++++++++++++++++
 compose.yml                |  2 ++
 setup-alpine.answers       |  3 ++-
 setup-alpine.sh            |  6 ++++--
 uefi.conf => uefi-web.conf |  0
 5 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 README.md
 rename uefi.conf => uefi-web.conf (100%)

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..5eb6578
--- /dev/null
+++ b/README.md
@@ -0,0 +1,23 @@
+# Stashapp
+
+Companion app to the stashbox.
+
+## Components
+
+### Trilium Notes
+
+Personal, customizable knowledgebase system using CKEditor.
+
+### Archivebox
+
+Archive web content.
+
+### Filestash (experimental)
+
+Middleware providing browse and share files and use onlyoffice tools.
+
+## Ephemeral Deployment
+There is an alternative approach where I could use the
+Alpine LBU and the `vm install` command to run a complete
+ephemeral deployment each time the vm starts up. I may
+look into that, but for now I'm using the sys disk type.
diff --git a/compose.yml b/compose.yml
index 45119e3..cdb44ae 100644
--- a/compose.yml
+++ b/compose.yml
@@ -89,6 +89,8 @@ services:
     container_name: archivebox
     command: server --quick-init 0.0.0.0:8000
     environment:
+      - PUID=1000
+      - PGID=1000
       - VIRTUAL_PORT=8000
       - VIRTUAL_HOST=${stashapp_archivebox_domain}
       - LETSENCRYPT_HOST=${stashapp_archivebox_domain}
diff --git a/setup-alpine.answers b/setup-alpine.answers
index bdaf404..063232b 100644
--- a/setup-alpine.answers
+++ b/setup-alpine.answers
@@ -15,7 +15,8 @@ DNSOPTS="-d othostash.com 2603:3015:1003:5621::deed:feed 2001:558:feed::1 2001:5
 TIMEZONEOPTS="-z UTC"
 PROXYOPTS=none
 APKREPOSOPTS="-c1"
-USEROPTS="no"
+# Doesn't work.
+#USEROPTS="-a -u -g audio,video,netdev -k 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDbhgdQui6flN1dXig81JYyWwvmD6ezwCwxHUgAwmNq+ul/hrR49A5twvEDwgSfFnkTW+ZcMHnUZPK2isbxblfKQAIybdeAZecPGaFwVx3Aktr34/ZTyt+NOPxEuPNE+IK1vDhYWLjEBlboPElqC7SQsXzrpRtusfApTIABIoP9JM9Q4n1bsHg8748Y+kXJ5Mf7trW1WCC5lw+8fOvJysI7u5iOWlIf0k7RQedaGZoMtLzxwntEyeve5vnyGQsKHVqmRyHWVWYTf5ZMktquQ0wiK0ua9keGS/iipTlNj4p5uQnnp5oS11sbiHpVy3WJaSt9BMxfg0zmBsH0EH5f6fxpgxYvajEND4UjBsBJ9Du/oMNLzrlExprLte6+TyBKrofe7oU38dbT+xE9TMbBgrryDi87e+xVjEiv/5WYJMyquQxx+cFz3BIv1AhfhiuPlR02YqfTdqkQKgKYDkhfxQ/9ZjZL49+Sr/sSuyt+3y9E/pR/iDLf6l4UknOQKH0o2RE= adamo@threadbox' caes"
 SSHDOPTS="-c openssh"
 NTPOPTS="-c openntpd"
 DISKOPTS="-s 16384 -m sys /dev/nvme0n1"
diff --git a/setup-alpine.sh b/setup-alpine.sh
index 912ca46..6611f0b 100644
--- a/setup-alpine.sh
+++ b/setup-alpine.sh
@@ -6,7 +6,7 @@ setup-alpine -f setup-alpine.answers
 ## /mnt/boot is device /dev/nvme0n1p1
 reboot
 
-apk add --update git docker docker-compose
+apk add --update git docker docker-compose rsync tmux
 
 # mount -t tmpfs cgroup_root /sys/fs/cgroup
 # mkdir -p /sys/fs/cgroup/devices
@@ -17,9 +17,11 @@ cgroup_root  /sys/fs/cgroup  tmpfs  defaults  0  0
 cgroup  /sys/fs/cgroup/devices  cgroup  defaults,devices  0  0
 " >> /etc/fstab
 mount /sys/fs/cgroup
+mkdir -p /sys/fs/cgroup/devices
 mount /sys/fs/cgroup/devices
 
 service docker start
 rc-update add docker boot
-setup-user -a -a -u -g audio,video,netdev,docker caes
+setup-user -a -u -g audio,video,netdev,docker -k 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDbhgdQui6flN1dXig81JYyWwvmD6ezwCwxHUgAwmNq+ul/hrR49A5twvEDwgSfFnkTW+ZcMHnUZPK2isbxblfKQAIybdeAZecPGaFwVx3Aktr34/ZTyt+NOPxEuPNE+IK1vDhYWLjEBlboPElqC7SQsXzrpRtusfApTIABIoP9JM9Q4n1bsHg8748Y+kXJ5Mf7trW1WCC5lw+8fOvJysI7u5iOWlIf0k7RQedaGZoMtLzxwntEyeve5vnyGQsKHVqmRyHWVWYTf5ZMktquQ0wiK0ua9keGS/iipTlNj4p5uQnnp5oS11sbiHpVy3WJaSt9BMxfg0zmBsH0EH5f6fxpgxYvajEND4UjBsBJ9Du/oMNLzrlExprLte6+TyBKrofe7oU38dbT+xE9TMbBgrryDi87e+xVjEiv/5WYJMyquQxx+cFz3BIv1AhfhiuPlR02YqfTdqkQKgKYDkhfxQ/9ZjZL49+Sr/sSuyt+3y9E/pR/iDLf6l4UknOQKH0o2RE= adamo@threadbox' caes
+
 
diff --git a/uefi.conf b/uefi-web.conf
similarity index 100%
rename from uefi.conf
rename to uefi-web.conf