From 1ed0377294d7a075a5697fe5e6201670672d49aa Mon Sep 17 00:00:00 2001 From: niten Date: Sat, 22 Jul 2023 10:38:19 -0700 Subject: [PATCH] Don't set the backend --- lemmy-docker.nix | 61 +++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/lemmy-docker.nix b/lemmy-docker.nix index becd369..6af3ef1 100644 --- a/lemmy-docker.nix +++ b/lemmy-docker.nix @@ -356,39 +356,36 @@ in { ]; virtualisation = { - arion = { - backend = "podman-socket"; - projects.lemmy.settings = let - lemmyImage = makeLemmyImage { - port = cfg.port; - stateDirectory = cfg.state-directory; - proxyCfg = { - image = "nginx:1-alpine"; - configFile = hostSecrets.lemmyNginxCfg.target-file; - }; - lemmyCfg = { - image = cfg.docker-images.lemmy; - configFile = hostSecrets.lemmyCfg.target-file; - envFile = hostSecrets.lemmyEnv.target-file; - }; - lemmyUiCfg = { - image = cfg.docker-images.lemmy-ui; - envFile = hostSecrets.lemmyUiEnv.target-file; - }; - pictrsCfg = { - image = cfg.docker-images.pictrs; - envFile = hostSecrets.lemmyPictrsEnv.target-file; - uid = config.users.users.lemmy-pictrs.uid; - }; - postgresCfg = { - image = cfg.docker-images.postgres; - envFile = hostSecrets.lemmyPostgresEnv.target-file; - configFile = hostSecrets.lemmyPostgresCfg.target-file; - uid = config.users.users.lemmy-postgres.uid; - }; + arion.projects.lemmy.settings = let + lemmyImage = makeLemmyImage { + port = cfg.port; + stateDirectory = cfg.state-directory; + proxyCfg = { + image = "nginx:1-alpine"; + configFile = hostSecrets.lemmyNginxCfg.target-file; }; - in { imports = [ lemmyImage ]; }; - }; + lemmyCfg = { + image = cfg.docker-images.lemmy; + configFile = hostSecrets.lemmyCfg.target-file; + envFile = hostSecrets.lemmyEnv.target-file; + }; + lemmyUiCfg = { + image = cfg.docker-images.lemmy-ui; + envFile = hostSecrets.lemmyUiEnv.target-file; + }; + pictrsCfg = { + image = cfg.docker-images.pictrs; + envFile = hostSecrets.lemmyPictrsEnv.target-file; + uid = config.users.users.lemmy-pictrs.uid; + }; + postgresCfg = { + image = cfg.docker-images.postgres; + envFile = hostSecrets.lemmyPostgresEnv.target-file; + configFile = hostSecrets.lemmyPostgresCfg.target-file; + uid = config.users.users.lemmy-postgres.uid; + }; + }; + in { imports = [ lemmyImage ]; }; }; services.nginx = {