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

+26 -43
+26 -42
nixos/modules/services/databases/pgmanage.nix
··· 41 41 42 42 pgmanage = "pgmanage"; 43 43 44 - pgmanageOptions = { 44 + in { 45 + 46 + options.services.pgmanage = { 45 47 enable = mkEnableOption "PostgreSQL Administration for the web"; 46 48 47 49 package = mkOption { ··· 176 178 }; 177 179 }; 178 180 179 - 180 - in { 181 - 182 - options.services.pgmanage = pgmanageOptions; 183 - 184 - # This is deprecated and should be removed for NixOS-18.03. 185 - options.services.postage = pgmanageOptions; 186 - 187 - config = mkMerge [ 188 - { assertions = [ 189 - { assertion = !config.services.postage.enable; 190 - message = 191 - "services.postage is deprecated in favour of pgmanage. " + 192 - "They have the same options so just substitute postage for pgmanage." ; 193 - } 194 - ]; 195 - } 196 - (mkIf cfg.enable { 197 - systemd.services.pgmanage = { 198 - description = "pgmanage - PostgreSQL Administration for the web"; 199 - wants = [ "postgresql.service" ]; 200 - after = [ "postgresql.service" ]; 201 - wantedBy = [ "multi-user.target" ]; 202 - serviceConfig = { 203 - User = pgmanage; 204 - Group = pgmanage; 205 - ExecStart = "${pkgs.pgmanage}/sbin/pgmanage -c ${confFile}" + 206 - optionalString cfg.localOnly " --local-only=true"; 207 - }; 181 + config = mkIf cfg.enable { 182 + systemd.services.pgmanage = { 183 + description = "pgmanage - PostgreSQL Administration for the web"; 184 + wants = [ "postgresql.service" ]; 185 + after = [ "postgresql.service" ]; 186 + wantedBy = [ "multi-user.target" ]; 187 + serviceConfig = { 188 + User = pgmanage; 189 + Group = pgmanage; 190 + ExecStart = "${pkgs.pgmanage}/sbin/pgmanage -c ${confFile}" + 191 + optionalString cfg.localOnly " --local-only=true"; 208 192 }; 209 - users = { 210 - users."${pgmanage}" = { 211 - name = pgmanage; 212 - group = pgmanage; 213 - home = cfg.sqlRoot; 214 - createHome = true; 215 - }; 216 - groups."${pgmanage}" = { 217 - name = pgmanage; 218 - }; 193 + }; 194 + users = { 195 + users."${pgmanage}" = { 196 + name = pgmanage; 197 + group = pgmanage; 198 + home = cfg.sqlRoot; 199 + createHome = true; 219 200 }; 220 - }) 221 - ]; 201 + groups."${pgmanage}" = { 202 + name = pgmanage; 203 + }; 204 + }; 205 + }; 222 206 }
-1
pkgs/top-level/aliases.nix
··· 219 219 pltScheme = racket; # just to be sure 220 220 polarssl = mbedtls; # added 2018-04-25 221 221 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 222 - postage = pgmanage; # added 2017-11-03 223 222 procps = procps-ng; # added 2018-04-25 224 223 prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27 225 224 pulseaudioLight = pulseaudio; # added 2018-04-25