From afd01fa7358a8e1d6a9fdbbb4f35692a8ad0da3a Mon Sep 17 00:00:00 2001 From: emptyynes Date: Mon, 29 Sep 2025 02:09:53 +0700 Subject: [PATCH] affine config changed --- affine/affine-server.nix | 43 ---------------------------------------- affine/main.nix | 8 ++++---- affine/migration.nix | 40 ------------------------------------- affine/postgres.nix | 36 --------------------------------- affine/redis.nix | 27 ------------------------- 5 files changed, 4 insertions(+), 150 deletions(-) delete mode 100644 affine/affine-server.nix delete mode 100644 affine/migration.nix delete mode 100644 affine/postgres.nix delete mode 100644 affine/redis.nix diff --git a/affine/affine-server.nix b/affine/affine-server.nix deleted file mode 100644 index 3dc270e..0000000 --- a/affine/affine-server.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ pkgs, lib, config, ... }: - -let - affine-static = "/var/lib/affine"; - affine-config = config.services.affine; -in { - config = lib.mkIf affine-config.enable { - virtualisation.oci-containers.containers."affine_server" = { - image = "ghcr.io/toeverything/affine:stable"; - environment = with affine-config.env; { - "AFFINE_INDEXER_ENABLED" = "false"; - "AFFINE_REVISION" = config.services.affine.revision; - "CONFIG_LOCATION" = "${affine-static}/config"; - "DATABASE_URL" = "postgresql://${DB_USERNAME}:${DB_PASSWORD}@postgres:5432/${DB_DATABASE}"; - "DB_DATABASE" = DB_DATABASE; - "DB_DATA_LOCATION" = "${affine-static}/db"; - "DB_PASSWORD" = DB_PASSWORD; - "DB_USERNAME" = DB_USERNAME; - "PORT" = toString PORT; - "REDIS_SERVER_HOST" = "redis"; - "UPLOAD_LOCATION" = "${affine-static}/storage"; - }; - volumes = [ - "${affine-static}/config:/root/.affine/config:rw" - "${affine-static}/storage:/root/.affine/storage:rw" - ]; - ports = [ "${ toString config.services.affine.env.PORT}:3010/tcp" ]; - dependsOn = [ "affine_migration_job" "affine_postgres" "affine_redis" ]; - log-driver = "journald"; - extraOptions = [ - "--network-alias=affine" - "--network=affine_default" - ]; - }; - systemd.services."docker-affine_server" = { - serviceConfig.Restart = lib.mkOverride 90 "always"; - after = [ "docker-network-affine_default.service" ]; - requires = [ "docker-network-affine_default.service" ]; - partOf = [ "docker-compose-affine-root.target" ]; - wantedBy = [ "docker-compose-affine-root.target" ]; - }; - }; -} \ No newline at end of file diff --git a/affine/main.nix b/affine/main.nix index 40105bd..f1e4aa5 100644 --- a/affine/main.nix +++ b/affine/main.nix @@ -3,10 +3,10 @@ { imports = [ ./affine.nix - ./affine-server.nix - ./redis.nix - ./postgres.nix - ./migration.nix + ./containers/affine-server.nix + ./containers/redis.nix + ./containers/postgres.nix + ./containers/migration.nix ./options.nix ]; } diff --git a/affine/migration.nix b/affine/migration.nix deleted file mode 100644 index 9abea36..0000000 --- a/affine/migration.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ pkgs, lib, config, ... }: - -let - affine-static = "/var/lib/affine"; - affine-config = config.services.affine; -in { - config = lib.mkIf affine-config.enable { - virtualisation.oci-containers.containers."affine_migration_job" = { - image = "ghcr.io/toeverything/affine:stable"; - environment = with affine-config.env; { - "AFFINE_INDEXER_ENABLED" = "false"; - "AFFINE_REVISION" = config.services.affine.revision; - "CONFIG_LOCATION" = "${affine-static}/config"; - "DATABASE_URL" = "postgresql://${DB_USERNAME}:${DB_PASSWORD}@postgres:5432/${DB_DATABASE}"; - "DB_DATABASE" = DB_DATABASE; - "DB_DATA_LOCATION" = "${affine-static}/db"; - "DB_PASSWORD" = DB_PASSWORD; - "DB_USERNAME" = DB_USERNAME; - "PORT" = toString PORT; - "REDIS_SERVER_HOST" = "redis"; - "UPLOAD_LOCATION" = "${affine-static}/storage"; - }; - volumes = [ - "${affine-static}/config:/root/.affine/config:rw" - "${affine-static}/storage:/root/.affine/storage:rw" - ]; - cmd = [ "sh" "-c" "node ./scripts/self-host-predeploy.js" ]; - dependsOn = [ "affine_postgres" "affine_redis" ]; - log-driver = "journald"; - extraOptions = [ "--network-alias=affine_migration" "--network=affine_default" ]; - }; - systemd.services."docker-affine_migration_job" = { - serviceConfig.Restart = lib.mkOverride 90 "no"; - after = [ "docker-network-affine_default.service" ]; - requires = [ "docker-network-affine_default.service" ]; - partOf = [ "docker-compose-affine-root.target" ]; - wantedBy = [ "docker-compose-affine-root.target" ]; - }; - }; -} \ No newline at end of file diff --git a/affine/postgres.nix b/affine/postgres.nix deleted file mode 100644 index a70f482..0000000 --- a/affine/postgres.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ pkgs, lib, config, ... }: - -let - affine-static = "/var/lib/affine"; - affine-config = config.services.affine; -in { - config = lib.mkIf affine-config.enable { - virtualisation.oci-containers.containers."affine_postgres" = { - image = "pgvector/pgvector:pg16"; - environment = with affine-config.env; { - "POSTGRES_DB" = DB_DATABASE; - "POSTGRES_HOST_AUTH_METHOD" = "trust"; - "POSTGRES_INITDB_ARGS" = "--data-checksums"; - "POSTGRES_PASSWORD" = DB_PASSWORD; - "POSTGRES_USER" = DB_USERNAME; - }; - volumes = [ "${affine-static}/db:/var/lib/postgresql/data:rw" ]; - log-driver = "journald"; - extraOptions = with affine-config.env; [ - "--health-cmd=[\"pg_isready\", \"-U\", \"${DB_USERNAME}\", \"-d\", \"${DB_DATABASE}\"]" - "--health-interval=10s" - "--health-retries=5" - "--health-timeout=5s" - "--network-alias=postgres" - "--network=affine_default" - ]; - }; - systemd.services."docker-affine_postgres" = { - serviceConfig.Restart = lib.mkOverride 90 "always"; - after = [ "docker-network-affine_default.service" ]; - requires = [ "docker-network-affine_default.service" ]; - partOf = [ "docker-compose-affine-root.target" ]; - wantedBy = [ "docker-compose-affine-root.target" ]; - }; - }; -} \ No newline at end of file diff --git a/affine/redis.nix b/affine/redis.nix deleted file mode 100644 index 56e1d3c..0000000 --- a/affine/redis.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ pkgs, lib, config, ... }: - -let - affine-config = config.services.affine; -in { - config = lib.mkIf affine-config.enable { - virtualisation.oci-containers.containers."affine_redis" = { - image = "redis"; - log-driver = "journald"; - extraOptions = [ - "--health-cmd=[\"redis-cli\", \"--raw\", \"incr\", \"ping\"]" - "--health-interval=10s" - "--health-retries=5" - "--health-timeout=5s" - "--network-alias=redis" - "--network=affine_default" - ]; - }; - systemd.services."docker-affine_redis" = { - serviceConfig.Restart = lib.mkOverride 90 "always"; - after = [ "docker-network-affine_default.service" ]; - requires = [ "docker-network-affine_default.service" ]; - partOf = [ "docker-compose-affine-root.target" ]; - wantedBy = [ "docker-compose-affine-root.target" ]; - }; - }; -} \ No newline at end of file