diff options
author | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-06-23 13:32:13 +0200 |
---|---|---|
committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-06-23 13:32:13 +0200 |
commit | 68fa306be68e67400cdf44b6dfd7f1018ea3fca5 (patch) | |
tree | d209d5561d7f7238f0ce9125c7656e317f02defc | |
parent | 59daa4fd629f7e6547bdff047d9759c353f29067 (diff) | |
download | nixlib-68fa306be68e67400cdf44b6dfd7f1018ea3fca5.tar nixlib-68fa306be68e67400cdf44b6dfd7f1018ea3fca5.tar.gz nixlib-68fa306be68e67400cdf44b6dfd7f1018ea3fca5.tar.bz2 nixlib-68fa306be68e67400cdf44b6dfd7f1018ea3fca5.tar.lz nixlib-68fa306be68e67400cdf44b6dfd7f1018ea3fca5.tar.xz nixlib-68fa306be68e67400cdf44b6dfd7f1018ea3fca5.tar.zst nixlib-68fa306be68e67400cdf44b6dfd7f1018ea3fca5.zip |
pgmanage: remove deprecated postage alias
The following has been removed: * The `services.postage` alias for the `services.pgmanage` module * The `postage` alias for the `pgmanage` package
-rw-r--r-- | nixos/modules/services/databases/pgmanage.nix | 68 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 |
2 files changed, 26 insertions, 43 deletions
diff --git a/nixos/modules/services/databases/pgmanage.nix b/nixos/modules/services/databases/pgmanage.nix index d1b48c06440e..1a34c7f5ecee 100644 --- a/nixos/modules/services/databases/pgmanage.nix +++ b/nixos/modules/services/databases/pgmanage.nix @@ -41,7 +41,9 @@ let pgmanage = "pgmanage"; - pgmanageOptions = { +in { + + options.services.pgmanage = { enable = mkEnableOption "PostgreSQL Administration for the web"; package = mkOption { @@ -176,47 +178,29 @@ let }; }; - -in { - - options.services.pgmanage = pgmanageOptions; - - # This is deprecated and should be removed for NixOS-18.03. - options.services.postage = pgmanageOptions; - - config = mkMerge [ - { assertions = [ - { assertion = !config.services.postage.enable; - message = - "services.postage is deprecated in favour of pgmanage. " + - "They have the same options so just substitute postage for pgmanage." ; - } - ]; - } - (mkIf cfg.enable { - systemd.services.pgmanage = { - description = "pgmanage - PostgreSQL Administration for the web"; - wants = [ "postgresql.service" ]; - after = [ "postgresql.service" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = pgmanage; - Group = pgmanage; - ExecStart = "${pkgs.pgmanage}/sbin/pgmanage -c ${confFile}" + - optionalString cfg.localOnly " --local-only=true"; - }; + config = mkIf cfg.enable { + systemd.services.pgmanage = { + description = "pgmanage - PostgreSQL Administration for the web"; + wants = [ "postgresql.service" ]; + after = [ "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = pgmanage; + Group = pgmanage; + ExecStart = "${pkgs.pgmanage}/sbin/pgmanage -c ${confFile}" + + optionalString cfg.localOnly " --local-only=true"; }; - users = { - users."${pgmanage}" = { - name = pgmanage; - group = pgmanage; - home = cfg.sqlRoot; - createHome = true; - }; - groups."${pgmanage}" = { - name = pgmanage; - }; + }; + users = { + users."${pgmanage}" = { + name = pgmanage; + group = pgmanage; + home = cfg.sqlRoot; + createHome = true; }; - }) - ]; + groups."${pgmanage}" = { + name = pgmanage; + }; + }; + }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5dafcfe22575..b653dfc7db69 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -219,7 +219,6 @@ mapAliases ({ pltScheme = racket; # just to be sure polarssl = mbedtls; # added 2018-04-25 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 - postage = pgmanage; # added 2017-11-03 procps = procps-ng; # added 2018-04-25 prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27 pulseaudioLight = pulseaudio; # added 2018-04-25 |