commit c8943272153d1ad5c7dd1329bf0045f2834d52dd · pyrox.dev/nixpkgs

nixos/doc/manual/release-notes/rl-1803.xml

···

       63
       63
        
             pass literal dollar signs through Postfix, double them.

     

       64
       64
        
           </para>

     

       65
       65
        
         </listitem>

     

       66
       66
       +
         <listitem>

     

       67
       67
       +
           <para>

     

       68
       68
       +
             The <literal>postage</literal> package (for web-based PostgreSQL

     

       69
       69
       +
             administration) has been renamed to <literal>pgmanage</literal>. The

     

       70
       70
       +
             corresponding module has also been renamed. To migrate please rename all

     

       71
       71
       +
             <option>services.postage</option> options to

     

       72
       72
       +
             <option>services.pgmanage</option>.

     

       73
       73
       +
           </para>

     

       74
       74
       +
         </listitem>

     

       66
       75
        
       </itemizedlist>

     

       67
       76
        
       

     

       68
       77
        
       </section>

+1 -1

nixos/modules/module-list.nix

···

       185
       185
        
         ./services/databases/neo4j.nix

     

       186
       186
        
         ./services/databases/openldap.nix

     

       187
       187
        
         ./services/databases/opentsdb.nix

     

       188
       188
       -
         ./services/databases/postage.nix

     

       188
       188
       +
         ./services/databases/pgmanage.nix

     

       189
       189
        
         ./services/databases/postgresql.nix

     

       190
       190
        
         ./services/databases/redis.nix

     

       191
       191
        
         ./services/databases/riak.nix

+222

nixos/modules/services/databases/pgmanage.nix

···

       1
       1
       +
       { lib, pkgs, config, ... } :

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         cfg = config.services.pgmanage;

     

       7
       7
       +
       

     

       8
       8
       +
         confFile = pkgs.writeTextFile {

     

       9
       9
       +
           name = "pgmanage.conf";

     

       10
       10
       +
           text =  ''

     

       11
       11
       +
             connection_file = ${pgmanageConnectionsFile}

     

       12
       12
       +
       

     

       13
       13
       +
             allow_custom_connections = ${builtins.toJSON cfg.allowCustomConnections}

     

       14
       14
       +
       

     

       15
       15
       +
             pgmanage_port = ${toString cfg.port}

     

       16
       16
       +
       

     

       17
       17
       +
             super_only = ${builtins.toJSON cfg.superOnly}

     

       18
       18
       +
       

     

       19
       19
       +
             ${optionalString (!isNull cfg.loginGroup) "login_group = ${cfg.loginGroup}"}

     

       20
       20
       +
       

     

       21
       21
       +
             login_timeout = ${toString cfg.loginTimeout}

     

       22
       22
       +
       

     

       23
       23
       +
             web_root = ${cfg.package}/etc/pgmanage/web_root

     

       24
       24
       +
       

     

       25
       25
       +
             data_root = ${cfg.dataRoot}

     

       26
       26
       +
       

     

       27
       27
       +
             ${optionalString (!isNull cfg.tls) ''

     

       28
       28
       +
             tls_cert = ${cfg.tls.cert}

     

       29
       29
       +
             tls_key = ${cfg.tls.key}

     

       30
       30
       +
             ''}

     

       31
       31
       +
       

     

       32
       32
       +
             log_level = ${cfg.logLevel}

     

       33
       33
       +
           '';

     

       34
       34
       +
         };

     

       35
       35
       +
       

     

       36
       36
       +
         pgmanageConnectionsFile = pkgs.writeTextFile {

     

       37
       37
       +
           name = "pgmanage-connections.conf";

     

       38
       38
       +
           text = concatStringsSep "\n"

     

       39
       39
       +
             (mapAttrsToList (name : conn : "${name}: ${conn}") cfg.connections);

     

       40
       40
       +
         };

     

       41
       41
       +
       

     

       42
       42
       +
         pgmanage = "pgmanage";

     

       43
       43
       +
       

     

       44
       44
       +
         pgmanageOptions = {

     

       45
       45
       +
           enable = mkEnableOption "PostgreSQL Administration for the web";

     

       46
       46
       +
       

     

       47
       47
       +
           package = mkOption {

     

       48
       48
       +
             type = types.package;

     

       49
       49
       +
             default = pkgs.pgmanage;

     

       50
       50
       +
             defaultText = "pkgs.pgmanage";

     

       51
       51
       +
             description = ''

     

       52
       52
       +
               The pgmanage package to use.

     

       53
       53
       +
             '';

     

       54
       54
       +
           };

     

       55
       55
       +
       

     

       56
       56
       +
           connections = mkOption {

     

       57
       57
       +
             type = types.attrsOf types.str;

     

       58
       58
       +
             default = {};

     

       59
       59
       +
             example = {

     

       60
       60
       +
               "nuc-server"  = "hostaddr=192.168.0.100 port=5432 dbname=postgres";

     

       61
       61
       +
               "mini-server" = "hostaddr=127.0.0.1 port=5432 dbname=postgres sslmode=require";

     

       62
       62
       +
             };

     

       63
       63
       +
             description = ''

     

       64
       64
       +
               pgmanage requires at least one PostgreSQL server be defined.

     

       65
       65
       +
               </para><para>

     

       66
       66
       +
               Detailed information about PostgreSQL connection strings is available at:

     

       67
       67
       +
               <link xlink:href="http://www.postgresql.org/docs/current/static/libpq-connect.html"/>

     

       68
       68
       +
               </para><para>

     

       69
       69
       +
               Note that you should not specify your user name or password. That

     

       70
       70
       +
               information will be entered on the login screen. If you specify a

     

       71
       71
       +
               username or password, it will be removed by pgmanage before attempting to

     

       72
       72
       +
               connect to a database.

     

       73
       73
       +
             '';

     

       74
       74
       +
           };

     

       75
       75
       +
       

     

       76
       76
       +
           allowCustomConnections = mkOption {

     

       77
       77
       +
             type = types.bool;

     

       78
       78
       +
             default = false;

     

       79
       79
       +
             description = ''

     

       80
       80
       +
               This tells pgmanage whether or not to allow anyone to use a custom

     

       81
       81
       +
               connection from the login screen.

     

       82
       82
       +
             '';

     

       83
       83
       +
           };

     

       84
       84
       +
       

     

       85
       85
       +
           port = mkOption {

     

       86
       86
       +
             type = types.int;

     

       87
       87
       +
             default = 8080;

     

       88
       88
       +
             description = ''

     

       89
       89
       +
               This tells pgmanage what port to listen on for browser requests.

     

       90
       90
       +
             '';

     

       91
       91
       +
           };

     

       92
       92
       +
       

     

       93
       93
       +
           localOnly = mkOption {

     

       94
       94
       +
             type = types.bool;

     

       95
       95
       +
             default = true;

     

       96
       96
       +
             description = ''

     

       97
       97
       +
               This tells pgmanage whether or not to set the listening socket to local

     

       98
       98
       +
               addresses only.

     

       99
       99
       +
             '';

     

       100
       100
       +
           };

     

       101
       101
       +
       

     

       102
       102
       +
           superOnly = mkOption {

     

       103
       103
       +
             type = types.bool;

     

       104
       104
       +
             default = true;

     

       105
       105
       +
             description = ''

     

       106
       106
       +
               This tells pgmanage whether or not to only allow super users to

     

       107
       107
       +
               login. The recommended value is true and will restrict users who are not

     

       108
       108
       +
               super users from logging in to any PostgreSQL instance through

     

       109
       109
       +
               pgmanage. Note that a connection will be made to PostgreSQL in order to

     

       110
       110
       +
               test if the user is a superuser.

     

       111
       111
       +
             '';

     

       112
       112
       +
           };

     

       113
       113
       +
       

     

       114
       114
       +
           loginGroup = mkOption {

     

       115
       115
       +
             type = types.nullOr types.str;

     

       116
       116
       +
             default = null;

     

       117
       117
       +
             description = ''

     

       118
       118
       +
               This tells pgmanage to only allow users in a certain PostgreSQL group to

     

       119
       119
       +
               login to pgmanage. Note that a connection will be made to PostgreSQL in

     

       120
       120
       +
               order to test if the user is a member of the login group.

     

       121
       121
       +
             '';

     

       122
       122
       +
           };

     

       123
       123
       +
       

     

       124
       124
       +
           loginTimeout = mkOption {

     

       125
       125
       +
             type = types.int;

     

       126
       126
       +
             default = 3600;

     

       127
       127
       +
             description = ''

     

       128
       128
       +
               Number of seconds of inactivity before user is automatically logged

     

       129
       129
       +
               out.

     

       130
       130
       +
             '';

     

       131
       131
       +
           };

     

       132
       132
       +
       

     

       133
       133
       +
           dataRoot = mkOption {

     

       134
       134
       +
             type = types.str;

     

       135
       135
       +
             default = "/var/lib/pgmanage";

     

       136
       136
       +
             description = ''

     

       137
       137
       +
               This tells pgmanage where to put the SQL file history. All tabs are saved

     

       138
       138
       +
               to this location so that if you get disconnected from pgmanage you

     

       139
       139
       +
               don't lose your work.

     

       140
       140
       +
             '';

     

       141
       141
       +
           };

     

       142
       142
       +
       

     

       143
       143
       +
           tls = mkOption {

     

       144
       144
       +
             type = types.nullOr (types.submodule {

     

       145
       145
       +
               options = {

     

       146
       146
       +
                 cert = mkOption {

     

       147
       147
       +
                   type = types.str;

     

       148
       148
       +
                   description = "TLS certificate";

     

       149
       149
       +
                 };

     

       150
       150
       +
                 key = mkOption {

     

       151
       151
       +
                   type = types.str;

     

       152
       152
       +
                   description = "TLS key";

     

       153
       153
       +
                 };

     

       154
       154
       +
               };

     

       155
       155
       +
             });

     

       156
       156
       +
             default = null;

     

       157
       157
       +
             description = ''

     

       158
       158
       +
               These options tell pgmanage where the TLS Certificate and Key files

     

       159
       159
       +
               reside. If you use these options then you'll only be able to access

     

       160
       160
       +
               pgmanage through a secure TLS connection. These options are only

     

       161
       161
       +
               necessary if you wish to connect directly to pgmanage using a secure TLS

     

       162
       162
       +
               connection. As an alternative, you can set up pgmanage in a reverse proxy

     

       163
       163
       +
               configuration. This allows your web server to terminate the secure

     

       164
       164
       +
               connection and pass on the request to pgmanage. You can find help to set

     

       165
       165
       +
               up this configuration in:

     

       166
       166
       +
               <link xlink:href="https://github.com/pgManage/pgManage/blob/master/INSTALL_NGINX.md"/>

     

       167
       167
       +
             '';

     

       168
       168
       +
           };

     

       169
       169
       +
       

     

       170
       170
       +
           logLevel = mkOption {

     

       171
       171
       +
             type = types.enum ["error" "warn" "notice" "info"];

     

       172
       172
       +
             default = "error";

     

       173
       173
       +
             description = ''

     

       174
       174
       +
               Verbosity of logs

     

       175
       175
       +
             '';

     

       176
       176
       +
           };

     

       177
       177
       +
         };

     

       178
       178
       +
       

     

       179
       179
       +
       

     

       180
       180
       +
       in {

     

       181
       181
       +
       

     

       182
       182
       +
         options.services.pgmanage = pgmanageOptions;

     

       183
       183
       +
       

     

       184
       184
       +
         # This is deprecated and should be removed for NixOS-18.03.

     

       185
       185
       +
         options.services.postage = pgmanageOptions;

     

       186
       186
       +
       

     

       187
       187
       +
         config = mkMerge [

     

       188
       188
       +
           { assertions = [

     

       189
       189
       +
               { assertion = !config.services.postage.enable;

     

       190
       190
       +
                 message =

     

       191
       191
       +
                   "services.postage is deprecated in favour of pgmanage. " +

     

       192
       192
       +
                   "They have the same options so just substitute postage for pgmanage." ;

     

       193
       193
       +
               }

     

       194
       194
       +
             ];

     

       195
       195
       +
           }

     

       196
       196
       +
           (mkIf cfg.enable {

     

       197
       197
       +
             systemd.services.pgmanage = {

     

       198
       198
       +
               description = "pgmanage - PostgreSQL Administration for the web";

     

       199
       199
       +
               wants    = [ "postgresql.service" ];

     

       200
       200
       +
               after    = [ "postgresql.service" ];

     

       201
       201
       +
               wantedBy = [ "multi-user.target" ];

     

       202
       202
       +
               serviceConfig = {

     

       203
       203
       +
                 User         = pgmanage;

     

       204
       204
       +
                 Group        = pgmanage;

     

       205
       205
       +
                 ExecStart    = "${pkgs.pgmanage}/sbin/pgmanage -c ${confFile}" +

     

       206
       206
       +
                                optionalString cfg.localOnly " --local-only=true";

     

       207
       207
       +
               };

     

       208
       208
       +
             };

     

       209
       209
       +
             users = {

     

       210
       210
       +
               users."${pgmanage}" = {

     

       211
       211
       +
                 name  = pgmanage;

     

       212
       212
       +
                 group = pgmanage;

     

       213
       213
       +
                 home  = cfg.dataRoot;

     

       214
       214
       +
                 createHome = true;

     

       215
       215
       +
               };

     

       216
       216
       +
               groups."${pgmanage}" = {

     

       217
       217
       +
                 name = pgmanage;

     

       218
       218
       +
               };

     

       219
       219
       +
             };

     

       220
       220
       +
           })

     

       221
       221
       +
         ];

     

       222
       222
       +
       }

-205

nixos/modules/services/databases/postage.nix

···

       1
       1
       -
       { lib, pkgs, config, ... } :

     

       2
       2
       -
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       5
       -
       let

     

       6
       6
       -
         cfg = config.services.postage;

     

       7
       7
       -
       

     

       8
       8
       -
         confFile = pkgs.writeTextFile {

     

       9
       9
       -
           name = "postage.conf";

     

       10
       10
       -
           text =  ''

     

       11
       11
       -
             connection_file = ${postageConnectionsFile}

     

       12
       12
       -
       

     

       13
       13
       -
             allow_custom_connections = ${builtins.toJSON cfg.allowCustomConnections}

     

       14
       14
       -
       

     

       15
       15
       -
             postage_port = ${toString cfg.port}

     

       16
       16
       -
       

     

       17
       17
       -
             super_only = ${builtins.toJSON cfg.superOnly}

     

       18
       18
       -
       

     

       19
       19
       -
             ${optionalString (!isNull cfg.loginGroup) "login_group = ${cfg.loginGroup}"}

     

       20
       20
       -
       

     

       21
       21
       -
             login_timeout = ${toString cfg.loginTimeout}

     

       22
       22
       -
       

     

       23
       23
       -
             web_root = ${cfg.package}/etc/postage/web_root

     

       24
       24
       -
       

     

       25
       25
       -
             data_root = ${cfg.dataRoot}

     

       26
       26
       -
       

     

       27
       27
       -
             ${optionalString (!isNull cfg.tls) ''

     

       28
       28
       -
             tls_cert = ${cfg.tls.cert}

     

       29
       29
       -
             tls_key = ${cfg.tls.key}

     

       30
       30
       -
             ''}

     

       31
       31
       -
       

     

       32
       32
       -
             log_level = ${cfg.logLevel}

     

       33
       33
       -
           '';

     

       34
       34
       -
         };

     

       35
       35
       -
       

     

       36
       36
       -
         postageConnectionsFile = pkgs.writeTextFile {

     

       37
       37
       -
           name = "postage-connections.conf";

     

       38
       38
       -
           text = concatStringsSep "\n"

     

       39
       39
       -
             (mapAttrsToList (name : conn : "${name}: ${conn}") cfg.connections);

     

       40
       40
       -
         };

     

       41
       41
       -
       

     

       42
       42
       -
         postage = "postage";

     

       43
       43
       -
       in {

     

       44
       44
       -
       

     

       45
       45
       -
         options.services.postage = {

     

       46
       46
       -
           enable = mkEnableOption "PostgreSQL Administration for the web";

     

       47
       47
       -
       

     

       48
       48
       -
           package = mkOption {

     

       49
       49
       -
             type = types.package;

     

       50
       50
       -
             default = pkgs.postage;

     

       51
       51
       -
             defaultText = "pkgs.postage";

     

       52
       52
       -
             description = ''

     

       53
       53
       -
               The postage package to use.

     

       54
       54
       -
             '';

     

       55
       55
       -
           };

     

       56
       56
       -
       

     

       57
       57
       -
           connections = mkOption {

     

       58
       58
       -
             type = types.attrsOf types.str;

     

       59
       59
       -
             default = {};

     

       60
       60
       -
             example = {

     

       61
       61
       -
               "nuc-server"  = "hostaddr=192.168.0.100 port=5432 dbname=postgres";

     

       62
       62
       -
               "mini-server" = "hostaddr=127.0.0.1 port=5432 dbname=postgres sslmode=require";

     

       63
       63
       -
             };

     

       64
       64
       -
             description = ''

     

       65
       65
       -
               Postage requires at least one PostgreSQL server be defined.

     

       66
       66
       -
               </para><para>

     

       67
       67
       -
               Detailed information about PostgreSQL connection strings is available at:

     

       68
       68
       -
               <link xlink:href="http://www.postgresql.org/docs/current/static/libpq-connect.html"/>

     

       69
       69
       -
               </para><para>

     

       70
       70
       -
               Note that you should not specify your user name or password. That

     

       71
       71
       -
               information will be entered on the login screen. If you specify a

     

       72
       72
       -
               username or password, it will be removed by Postage before attempting to

     

       73
       73
       -
               connect to a database.

     

       74
       74
       -
             '';

     

       75
       75
       -
           };

     

       76
       76
       -
       

     

       77
       77
       -
           allowCustomConnections = mkOption {

     

       78
       78
       -
             type = types.bool;

     

       79
       79
       -
             default = false;

     

       80
       80
       -
             description = ''

     

       81
       81
       -
               This tells Postage whether or not to allow anyone to use a custom

     

       82
       82
       -
               connection from the login screen.

     

       83
       83
       -
             '';

     

       84
       84
       -
           };

     

       85
       85
       -
       

     

       86
       86
       -
           port = mkOption {

     

       87
       87
       -
             type = types.int;

     

       88
       88
       -
             default = 8080;

     

       89
       89
       -
             description = ''

     

       90
       90
       -
               This tells Postage what port to listen on for browser requests.

     

       91
       91
       -
             '';

     

       92
       92
       -
           };

     

       93
       93
       -
       

     

       94
       94
       -
           localOnly = mkOption {

     

       95
       95
       -
             type = types.bool;

     

       96
       96
       -
             default = true;

     

       97
       97
       -
             description = ''

     

       98
       98
       -
               This tells Postage whether or not to set the listening socket to local

     

       99
       99
       -
               addresses only.

     

       100
       100
       -
             '';

     

       101
       101
       -
           };

     

       102
       102
       -
       

     

       103
       103
       -
           superOnly = mkOption {

     

       104
       104
       -
             type = types.bool;

     

       105
       105
       -
             default = true;

     

       106
       106
       -
             description = ''

     

       107
       107
       -
               This tells Postage whether or not to only allow super users to

     

       108
       108
       -
               login. The recommended value is true and will restrict users who are not

     

       109
       109
       -
               super users from logging in to any PostgreSQL instance through

     

       110
       110
       -
               Postage. Note that a connection will be made to PostgreSQL in order to

     

       111
       111
       -
               test if the user is a superuser.

     

       112
       112
       -
             '';

     

       113
       113
       -
           };

     

       114
       114
       -
       

     

       115
       115
       -
           loginGroup = mkOption {

     

       116
       116
       -
             type = types.nullOr types.str;

     

       117
       117
       -
             default = null;

     

       118
       118
       -
             description = ''

     

       119
       119
       -
               This tells Postage to only allow users in a certain PostgreSQL group to

     

       120
       120
       -
               login to Postage. Note that a connection will be made to PostgreSQL in

     

       121
       121
       -
               order to test if the user is a member of the login group.

     

       122
       122
       -
             '';

     

       123
       123
       -
           };

     

       124
       124
       -
       

     

       125
       125
       -
           loginTimeout = mkOption {

     

       126
       126
       -
             type = types.int;

     

       127
       127
       -
             default = 3600;

     

       128
       128
       -
             description = ''

     

       129
       129
       -
               Number of seconds of inactivity before user is automatically logged

     

       130
       130
       -
               out.

     

       131
       131
       -
             '';

     

       132
       132
       -
           };

     

       133
       133
       -
       

     

       134
       134
       -
           dataRoot = mkOption {

     

       135
       135
       -
             type = types.str;

     

       136
       136
       -
             default = "/var/lib/postage";

     

       137
       137
       -
             description = ''

     

       138
       138
       -
               This tells Postage where to put the SQL file history. All tabs are saved

     

       139
       139
       -
               to this location so that if you get disconnected from Postage you

     

       140
       140
       -
               don't lose your work.

     

       141
       141
       -
             '';

     

       142
       142
       -
           };

     

       143
       143
       -
       

     

       144
       144
       -
           tls = mkOption {

     

       145
       145
       -
             type = types.nullOr (types.submodule {

     

       146
       146
       -
               options = {

     

       147
       147
       -
                 cert = mkOption {

     

       148
       148
       -
                   type = types.str;

     

       149
       149
       -
                   description = "TLS certificate";

     

       150
       150
       -
                 };

     

       151
       151
       -
                 key = mkOption {

     

       152
       152
       -
                   type = types.str;

     

       153
       153
       -
                   description = "TLS key";

     

       154
       154
       -
                 };

     

       155
       155
       -
               };

     

       156
       156
       -
             });

     

       157
       157
       -
             default = null;

     

       158
       158
       -
             description = ''

     

       159
       159
       -
               These options tell Postage where the TLS Certificate and Key files

     

       160
       160
       -
               reside. If you use these options then you'll only be able to access

     

       161
       161
       -
               Postage through a secure TLS connection. These options are only

     

       162
       162
       -
               necessary if you wish to connect directly to Postage using a secure TLS

     

       163
       163
       -
               connection. As an alternative, you can set up Postage in a reverse proxy

     

       164
       164
       -
               configuration. This allows your web server to terminate the secure

     

       165
       165
       -
               connection and pass on the request to Postage. You can find help to set

     

       166
       166
       -
               up this configuration in:

     

       167
       167
       -
               <link xlink:href="https://github.com/workflowproducts/postage/blob/master/INSTALL_NGINX.md"/>

     

       168
       168
       -
             '';

     

       169
       169
       -
           };

     

       170
       170
       -
       

     

       171
       171
       -
           logLevel = mkOption {

     

       172
       172
       -
             type = types.enum ["error" "warn" "notice" "info"];

     

       173
       173
       -
             default = "error";

     

       174
       174
       -
             description = ''

     

       175
       175
       -
               Verbosity of logs

     

       176
       176
       -
             '';

     

       177
       177
       -
           };

     

       178
       178
       -
         };

     

       179
       179
       -
       

     

       180
       180
       -
         config = mkIf cfg.enable {

     

       181
       181
       -
           systemd.services.postage = {

     

       182
       182
       -
             description = "postage - PostgreSQL Administration for the web";

     

       183
       183
       -
             wants    = [ "postgresql.service" ];

     

       184
       184
       -
             after    = [ "postgresql.service" ];

     

       185
       185
       -
             wantedBy = [ "multi-user.target" ];

     

       186
       186
       -
             serviceConfig = {

     

       187
       187
       -
               User         = postage;

     

       188
       188
       -
               Group        = postage;

     

       189
       189
       -
               ExecStart    = "${pkgs.postage}/sbin/postage -c ${confFile}" +

     

       190
       190
       -
                              optionalString cfg.localOnly " --local-only=true";

     

       191
       191
       -
             };

     

       192
       192
       -
           };

     

       193
       193
       -
           users = {

     

       194
       194
       -
             users."${postage}" = {

     

       195
       195
       -
               name  = postage;

     

       196
       196
       -
               group = postage;

     

       197
       197
       -
               home  = cfg.dataRoot;

     

       198
       198
       -
               createHome = true;

     

       199
       199
       -
             };

     

       200
       200
       -
             groups."${postage}" = {

     

       201
       201
       -
               name = postage;

     

       202
       202
       -
             };

     

       203
       203
       -
           };

     

       204
       204
       -
         };

     

       205
       205
       -
       }

nixos/release.nix

···

       306
       306
        
         #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; });

     

       307
       307
        
         tests.peerflix = callTest tests/peerflix.nix {};

     

       308
       308
        
         tests.postgresql = callSubTests tests/postgresql.nix {};

     

       309
       309
       +
         tests.pgmanage = callTest tests/pgmanage.nix {};

     

       309
       310
        
         tests.postgis = callTest tests/postgis.nix {};

     

       310
       311
        
         #tests.pgjwt = callTest tests/pgjwt.nix {};

     

       311
       312
        
         tests.printing = callTest tests/printing.nix {};

+39

nixos/tests/pgmanage.nix

···

       1
       1
       +
       import ./make-test.nix ({ pkgs, ... } :

     

       2
       2
       +
       let

     

       3
       3
       +
         role     = "test";

     

       4
       4
       +
         password = "secret";

     

       5
       5
       +
         conn     = "local";

     

       6
       6
       +
       in

     

       7
       7
       +
       {

     

       8
       8
       +
         name = "pgmanage";

     

       9
       9
       +
         meta = with pkgs.stdenv.lib.maintainers; {

     

       10
       10
       +
           maintainers = [ basvandijk ];

     

       11
       11
       +
         };

     

       12
       12
       +
         nodes = {

     

       13
       13
       +
           one = { config, pkgs, ... }: {

     

       14
       14
       +
             services = {

     

       15
       15
       +
               postgresql = {

     

       16
       16
       +
                 enable = true;

     

       17
       17
       +
                 initialScript = pkgs.writeText "pg-init-script" ''

     

       18
       18
       +
                   CREATE ROLE ${role} SUPERUSER LOGIN PASSWORD '${password}';

     

       19
       19
       +
                 '';

     

       20
       20
       +
               };

     

       21
       21
       +
               pgmanage = {

     

       22
       22
       +
                 enable = true;

     

       23
       23
       +
                 connections = {

     

       24
       24
       +
                   "${conn}" = "hostaddr=127.0.0.1 port=${toString config.services.postgresql.port} dbname=postgres";

     

       25
       25
       +
                 };

     

       26
       26
       +
               };

     

       27
       27
       +
             };

     

       28
       28
       +
           };

     

       29
       29
       +
         };

     

       30
       30
       +
       

     

       31
       31
       +
         testScript = ''

     

       32
       32
       +
           startAll;

     

       33
       33
       +
           $one->waitForUnit("default.target");

     

       34
       34
       +
           $one->requireActiveUnit("pgmanage.service");

     

       35
       35
       +
       

     

       36
       36
       +
           # Test if we can log in.

     

       37
       37
       +
           $one->waitUntilSucceeds("curl 'http://localhost:8080/pgmanage/auth' --data 'action=login&connname=${conn}&username=${role}&password=${password}' --fail");

     

       38
       38
       +
         '';

     

       39
       39
       +
       })

+8 -8

pkgs/applications/misc/postage/default.nix pkgs/applications/misc/pgmanage/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, runCommand, postgresql, openssl } :

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "postage-${version}";

     

       5
       5
       -
         version = "3.2.18";

     

       4
       4
       +
         name = "pgmanage-${version}";

     

       5
       5
       +
         version = "10.0.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
       -
           owner  = "workflowproducts";

     

       9
       9
       -
           repo   = "postage";

     

       10
       10
       -
           rev    = "eV${version}";

     

       11
       11
       -
           sha256 = "1kdg8pw2vxwkxw3b6dim4s740s60j3iyrh96524wi3lqkkq98krn";

     

       8
       8
       +
           owner  = "pgManage";

     

       9
       9
       +
           repo   = "pgManage";

     

       10
       10
       +
           rev    = "v${version}";

     

       11
       11
       +
           sha256 = "0g9kvhs9b6kc1s7j90fqv71amiy9v0w5p906yfvl0j7pf3ayq35a";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         buildInputs = [ postgresql openssl ];

     
···

       20
       20
        
             the style of NGINX and Node.js. This heart makes Postage as fast as any

     

       21
       21
        
             PostgreSQL interface can hope to be.

     

       22
       22
        
           '';

     

       23
       23
       -
           homepage = http://www.workflowproducts.com/postage.html;

     

       24
       24
       -
           license = licenses.asl20;

     

       23
       23
       +
           homepage = https://github.com/pgManage/pgManage;

     

       24
       24
       +
           license = licenses.postgresql;

     

       25
       25
        
           maintainers = [ maintainers.basvandijk ];

     

       26
       26
        
         };

     

       27
       27
        
       }

pkgs/top-level/aliases.nix

···

       116
       116
        
         pgp-tools = signing-party; # added 2017-03-26

     

       117
       117
        
         pidgin-with-plugins = pidgin; # added 2016-06

     

       118
       118
        
         pidginlatexSF = pidginlatex; # added 2014-11-02

     

       119
       119
       +
         postage = pgmanage; # added 2017-11-03

     

       119
       120
        
         poppler_qt5 = libsForQt5.poppler;  # added 2015-12-19

     

       120
       121
        
         PPSSPP = ppsspp; # added 2017-10-01

     

       121
       122
        
         prometheus-statsd-bridge = prometheus-statsd-exporter;  # added 2017-08-27

+1 -1

pkgs/top-level/all-packages.nix

···

       19309
       19309
        
       

     

       19310
       19310
        
         opkg-utils = callPackage ../tools/package-management/opkg-utils { };

     

       19311
       19311
        
       

     

       19312
       19312
       -
         postage = callPackage ../applications/misc/postage { };

     

       19312
       19312
       +
         pgmanage = callPackage ../applications/misc/pgmanage { };

     

       19313
       19313
        
       

     

       19314
       19314
        
         pgadmin = callPackage ../applications/misc/pgadmin { };

     

       19315
       19315