diff --git a/actual_budget/actual-data/server-files/account.sqlite b/actual_budget/actual-data/server-files/account.sqlite index 757d50d..e0778ec 100644 Binary files a/actual_budget/actual-data/server-files/account.sqlite and b/actual_budget/actual-data/server-files/account.sqlite differ diff --git a/actual_budget/actual-data/user-files/file-e9678c1f-ae65-4022-951e-3d7f79bdcc2e.blob b/actual_budget/actual-data/user-files/file-e9678c1f-ae65-4022-951e-3d7f79bdcc2e.blob index 33b0058..2992814 100644 Binary files a/actual_budget/actual-data/user-files/file-e9678c1f-ae65-4022-951e-3d7f79bdcc2e.blob and b/actual_budget/actual-data/user-files/file-e9678c1f-ae65-4022-951e-3d7f79bdcc2e.blob differ diff --git a/actual_budget/actual-data/user-files/group-45cd4fba-400d-4474-997b-37ce959ada0d.sqlite b/actual_budget/actual-data/user-files/group-45cd4fba-400d-4474-997b-37ce959ada0d.sqlite new file mode 100644 index 0000000..82af471 Binary files /dev/null and b/actual_budget/actual-data/user-files/group-45cd4fba-400d-4474-997b-37ce959ada0d.sqlite differ diff --git a/caddy/compose.yml b/caddy/compose.yml index 250bd3e..c9d18e9 100644 --- a/caddy/compose.yml +++ b/caddy/compose.yml @@ -2,6 +2,8 @@ services: caddy: image: caddy:alpine restart: always + cap_add: + - NET_ADMIN ports: - "80:80" - "443:443" diff --git a/caddy/conf/Caddyfile b/caddy/conf/Caddyfile index e760bae..5c45f58 100644 --- a/caddy/conf/Caddyfile +++ b/caddy/conf/Caddyfile @@ -19,6 +19,6 @@ actuals.01v0.com:443 { } #travel.01v0.com:443 { -# root * /srv/ -# file_server +# root * /srv/ +# file_server #} diff --git a/immich-app/.env b/immich-app/.env old mode 100644 new mode 100755 index 0450dc0..090976b --- a/immich-app/.env +++ b/immich-app/.env @@ -20,3 +20,5 @@ DB_PASSWORD=postgres ################################################################################### DB_USERNAME=postgres DB_DATABASE_NAME=immich + +# IMMICH_LOG_LEVEL=verbose diff --git a/immich-app/docker-compose.yml b/immich-app/docker-compose.yml old mode 100644 new mode 100755 index c6a76a4..99d4665 --- a/immich-app/docker-compose.yml +++ b/immich-app/docker-compose.yml @@ -20,6 +20,7 @@ services: # Do not edit the next line. If you want to change the media storage location on your system, edit the value of UPLOAD_LOCATION in the .env file - ${UPLOAD_LOCATION}:/usr/src/app/upload - /etc/localtime:/etc/localtime:ro + - /mnt/inter_samba/Photos_Originals:/photos_originals env_file: - .env ports: @@ -33,8 +34,8 @@ services: deploy: resources: limits: - cpus: '1.0' - memory: 1000M + cpus: '2.0' + memory: 4000M immich-machine-learning: container_name: immich_machine_learning @@ -54,24 +55,24 @@ services: deploy: resources: limits: - cpus: '1.0' - memory: 1000M + cpus: '2.0' + memory: 4000M redis: container_name: immich_redis - image: docker.io/valkey/valkey:8-bookworm@sha256:fec42f399876eb6faf9e008570597741c87ff7662a54185593e74b09ce83d177 + image: docker.io/valkey/valkey:9@sha256:546304417feac0874c3dd576e0952c6bb8f06bb4093ea0c9ca303c73cf458f63 healthcheck: test: redis-cli ping || exit 1 - restart: always + restart: unless-stopped deploy: resources: limits: - cpus: '1.0' - memory: 500M + cpus: '2.0' + memory: 40000M database: container_name: immich_postgres - image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0 + image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0@sha256:bcf63357191b76a916ae5eb93464d65c07511da41e3bf7a8416db519b40b1c23 environment: POSTGRES_PASSWORD: ${DB_PASSWORD} POSTGRES_USER: ${DB_USERNAME} @@ -82,12 +83,13 @@ services: volumes: # Do not edit the next line. If you want to change the database storage location on your system, edit the value of DB_DATA_LOCATION in the .env file - ${DB_DATA_LOCATION}:/var/lib/postgresql/data + shm_size: 128mb restart: unless-stopped deploy: resources: limits: - cpus: '1.0' - memory: 500M + cpus: '2.0' + memory: 4000M volumes: model-cache: diff --git a/obsidian/.env b/obsidian/.env new file mode 100644 index 0000000..554a28f --- /dev/null +++ b/obsidian/.env @@ -0,0 +1,2 @@ +COUCHDB_USER=pleasant +COUCHDB_PASSWORD=dC0y#fiBg56 diff --git a/obsidian/.env.save b/obsidian/.env.save new file mode 100644 index 0000000..431b531 --- /dev/null +++ b/obsidian/.env.save @@ -0,0 +1,3 @@ +COUCHDB_USER=obsidian_user +COUCHDB_PASSWORD=ob123 + diff --git a/obsidian/compose.yaml b/obsidian/compose.yaml new file mode 100644 index 0000000..af0fc71 --- /dev/null +++ b/obsidian/compose.yaml @@ -0,0 +1,23 @@ +services: + obsidian-livesync: + container_name: obsidian-livesync #shortened name + image: couchdb:latest + env_file: + - .env + environment: + - COUCHDB_USER=${COUCHDB_USER} + - COUCHDB_PASSWORD=${COUCHDB_PASSWORD} + volumes: + - /root/setup/VPS_Setup/obsidian/couchdb-data:/opt/couchdb/data + - /root/setup/VPS_Setup/obsidian/couchdb-etc:/opt/couchdb/etc/local.d + ports: + - "5984:5984" + restart: unless-stopped + healthcheck: + test: curl --fail -s -u ${COUCHDB_USER}:${COUCHDB_PASSWORD} http://localhost:5984/_up | grep -Eo '\"status\":\"ok\"' || exit 1 + interval: 30s + timeout: 10s + retries: 3 + labels: + - "net.unraid.docker.webui=http://[IP]:[PORT:5984]/_utils" # for some reason this does not work properly + - "net.unraid.docker.icon=https://raw.githubusercontent.com/selfhst/icons/refs/heads/main/png/couchdb.png" diff --git a/obsidian/couchdb-data/_dbs.couch b/obsidian/couchdb-data/_dbs.couch new file mode 100644 index 0000000..213619c Binary files /dev/null and b/obsidian/couchdb-data/_dbs.couch differ diff --git a/obsidian/couchdb-data/_nodes.couch b/obsidian/couchdb-data/_nodes.couch new file mode 100644 index 0000000..c673acc Binary files /dev/null and b/obsidian/couchdb-data/_nodes.couch differ diff --git a/actual_budget/actual-data/user-files/group-75fd4553-665f-4c93-a56a-457e67d7de20.sqlite b/obsidian/couchdb-data/shards/00000000-7fffffff/_users.1770313999.couch similarity index 57% rename from actual_budget/actual-data/user-files/group-75fd4553-665f-4c93-a56a-457e67d7de20.sqlite rename to obsidian/couchdb-data/shards/00000000-7fffffff/_users.1770313999.couch index 04477bc..2ecabc5 100644 Binary files a/actual_budget/actual-data/user-files/group-75fd4553-665f-4c93-a56a-457e67d7de20.sqlite and b/obsidian/couchdb-data/shards/00000000-7fffffff/_users.1770313999.couch differ diff --git a/obsidian/couchdb-data/shards/00000000-7fffffff/obsidian.1772374548.couch b/obsidian/couchdb-data/shards/00000000-7fffffff/obsidian.1772374548.couch new file mode 100644 index 0000000..41c781c Binary files /dev/null and b/obsidian/couchdb-data/shards/00000000-7fffffff/obsidian.1772374548.couch differ diff --git a/obsidian/couchdb-data/shards/80000000-ffffffff/_users.1770313999.couch b/obsidian/couchdb-data/shards/80000000-ffffffff/_users.1770313999.couch new file mode 100644 index 0000000..b5c8ea9 Binary files /dev/null and b/obsidian/couchdb-data/shards/80000000-ffffffff/_users.1770313999.couch differ diff --git a/obsidian/couchdb-data/shards/80000000-ffffffff/obsidian.1772374548.couch b/obsidian/couchdb-data/shards/80000000-ffffffff/obsidian.1772374548.couch new file mode 100644 index 0000000..9aa356b Binary files /dev/null and b/obsidian/couchdb-data/shards/80000000-ffffffff/obsidian.1772374548.couch differ diff --git a/obsidian/couchdb-etc/docker.ini b/obsidian/couchdb-etc/docker.ini new file mode 100644 index 0000000..b6a5f59 --- /dev/null +++ b/obsidian/couchdb-etc/docker.ini @@ -0,0 +1,18 @@ + +[admins] +pleasant = -pbkdf2:sha256-bc41e84f208cd73b1c16ada2e9b529d59f2d9afb97fde05d66f8f351647e0988,f1ae600c51e28fd1e9a19575244a6578,600000 + +[couchdb] +uuid = 4dee7bd84bb0314014907be0319908b9 + +[chttpd_auth] +secret = a9a045afb03c73e24158f971b07a67d5 + +[chttpd] +enable_cors = true + +[cors] +origins = * +headers = accept, authorization, content-type, origin, referer +credentials = true +methods = GET, PUT, POST, HEAD, DELETE diff --git a/setup.sh b/setup.sh index b104d9e..9968ff0 100644 --- a/setup.sh +++ b/setup.sh @@ -50,7 +50,7 @@ else echo installing tailscale curl -fsSL https://tailscale.com/install.sh | sh fi -sudo tailscale up --auth-key=tskey-auth-koHiorB8cj11CNTRL-dLaNRmukCWL5BurtnvU2WLDbrv4SDhVDX --hostname=IONOS +sudo tailscale up --auth-key=tskey-auth-koHiorB8cj11CNTRL-dLaNRmukCWL5BurtnvU2WLDbrv4SDhVDX --hostname=IONOS --ssh ### Docker Containers to Compose ### declare -a arr=(