diff --git a/Ttrss/default.nix b/Ttrss/config.nix similarity index 100% rename from Ttrss/default.nix rename to Ttrss/config.nix diff --git a/Ttrss/dbupgrade.nix b/Ttrss/dbupgrade.nix index 33cca61..e848357 100644 --- a/Ttrss/dbupgrade.nix +++ b/Ttrss/dbupgrade.nix @@ -5,7 +5,7 @@ , user }: { TtrssPostgresDB -, TtrssService +, TtrssConfig }: stdenv.mkDerivation { diff --git a/Ttrss/update.nix b/Ttrss/update.nix index 051f5a3..9180fa1 100644 --- a/Ttrss/update.nix +++ b/Ttrss/update.nix @@ -8,7 +8,7 @@ , readWritePaths ? [] , postgresServiceName }: -{ TtrssService +{ TtrssConfig , TtrssPostgresDB , ... }: @@ -33,8 +33,8 @@ utils.systemd.mkService rec { After=network.target ${postgresServiceName} [Service] - User=${TtrssService.user} - Group=${TtrssService.group} + User=${TtrssConfig.user} + Group=${TtrssConfig.group} ExecStart=${pkgs.php}/bin/php ${fullPath}/update_daemon2.php RuntimeDirectory=${name} diff --git a/all-packages.nix b/all-packages.nix index a9cdf8b..44ef6ed 100644 --- a/all-packages.nix +++ b/all-packages.nix @@ -12,7 +12,7 @@ let PostgresDB = callPackage ./PostgresDB {}; TtrssEnvironment = callPackage ./Ttrss/environment.nix {}; - TtrssService = callPackage ./Ttrss {}; + TtrssConfig = callPackage ./Ttrss/config.nix {}; TtrssUpdateService = callPackage ./Ttrss/update.nix {inherit utils;}; TtrssUpgradeDBService = callPackage ./Ttrss/dbupgrade.nix {}; };