From 3a322a114aedfd8c784b6044b9278df97f958eac Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@devalot.com>
Date: Mon, 8 Apr 2019 12:45:31 -0700
Subject: [PATCH] rails: Decouple helper functions from the config variable

---
 modules/services/web/rails/default.nix   |  2 +-
 modules/services/web/rails/functions.nix |  6 ------
 modules/services/web/rails/options.nix   |  2 +-
 modules/services/web/rails/systemd.nix   | 10 +++++++---
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/modules/services/web/rails/default.nix b/modules/services/web/rails/default.nix
index 8abfb29..91d4262 100644
--- a/modules/services/web/rails/default.nix
+++ b/modules/services/web/rails/default.nix
@@ -12,7 +12,7 @@ let
   ##############################################################################
   options    = import ./options.nix { inherit config lib pkgs; };
   appSystemd = import ./systemd.nix { inherit config pkgs lib; };
-  funcs      = import ./functions.nix { inherit config; };
+  funcs      = import ./functions.nix;
   scripts    = import ./scripts.nix { inherit lib pkgs; };
 
   ##############################################################################
diff --git a/modules/services/web/rails/functions.nix b/modules/services/web/rails/functions.nix
index ba50604..2d6dd1e 100644
--- a/modules/services/web/rails/functions.nix
+++ b/modules/services/web/rails/functions.nix
@@ -1,5 +1,3 @@
-{ config }:
-
 rec {
 
   ##############################################################################
@@ -14,10 +12,6 @@ rec {
   # Path to where the app is actually installed:
   appLink = app: "${app.home}/package";
 
-  ##############################################################################
-  # Is PostgreSQL local?
-  localpg = config.phoebe.services.postgresql.enable;
-
   ##############################################################################
   # Packages to put in the application's PATH.  FIXME:
   # propagatedBuildInputs won't always be set.
diff --git a/modules/services/web/rails/options.nix b/modules/services/web/rails/options.nix
index 71bbbdc..8c1defe 100644
--- a/modules/services/web/rails/options.nix
+++ b/modules/services/web/rails/options.nix
@@ -4,7 +4,7 @@ with lib;
 
 let
   ##############################################################################
-  functions = import ./functions.nix { inherit config; };
+  functions = import ./functions.nix;
 
   ##############################################################################
   # Database configuration:
diff --git a/modules/services/web/rails/systemd.nix b/modules/services/web/rails/systemd.nix
index 17f3c8b..c62ba1d 100644
--- a/modules/services/web/rails/systemd.nix
+++ b/modules/services/web/rails/systemd.nix
@@ -10,9 +10,13 @@ let
   ##############################################################################
   # Helpful functions.
   plib  = config.phoebe.lib;
-  funcs = import ./functions.nix { inherit config; };
+  funcs = import ./functions.nix;
   scripts = import ./scripts.nix { inherit lib pkgs; };
 
+  ##############################################################################
+  # Is PostgreSQL local?
+  localpg = config.phoebe.services.postgresql.enable;
+
   ##############################################################################
   # The main Rails service:
   mainService = app: {
@@ -44,8 +48,8 @@ let
 
       after =
         [ "network.target" ] ++
-        optional funcs.localpg  "postgresql.service" ++
-        optional funcs.localpg  "pg-accounts.service" ++
+        optional localpg  "postgresql.service" ++
+        optional localpg  "pg-accounts.service" ++
         optional (!service.isMain) "rails-${app.name}-main" ++
         plib.keyService app.database.passwordFile ++
         plib.keyService app.sourcedFile ++