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

Changed files
+26 -43
nixos
modules
services
databases
pkgs
top-level
+26 -42
nixos/modules/services/databases/pgmanage.nix
···
pgmanage = "pgmanage";
-
pgmanageOptions = {
+
in {
+
+
options.services.pgmanage = {
enable = mkEnableOption "PostgreSQL Administration for the web";
package = mkOption {
···
};
};
-
-
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;
+
};
+
};
+
};
}
-1
pkgs/top-level/aliases.nix
···
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