commit 17c6f625037d103f491f9bc434bb195fe432e78a · pyrox.dev/nixpkgs

+23 -11

nixos/modules/services/misc/sourcehut/default.nix

···

       238
       238
        
                 };

     

       239
       239
        
                 smtp-user = mkOptionNullOrStr "Outgoing SMTP user.";

     

       240
       240
        
                 smtp-password = mkOptionNullOrStr "Outgoing SMTP password.";

     

       241
       241
       -
                 smtp-from = mkOptionNullOrStr "Outgoing SMTP FROM.";

     

       241
       241
       +
                 smtp-from = mkOption {

     

       242
       242
       +
                   type = types.str;

     

       243
       243
       +
                   description = "Outgoing SMTP FROM.";

     

       244
       244
       +
                 };

     

       242
       245
        
                 error-to = mkOptionNullOrStr "Address receiving application exceptions";

     

       243
       246
        
                 error-from = mkOptionNullOrStr "Address sending application exceptions";

     

       244
       244
       -
                 pgp-privkey = mkOptionNullOrStr ''

     

       245
       245
       -
                   An absolute file path (which should be outside the Nix-store)

     

       246
       246
       -
                   to an OpenPGP private key.

     

       247
       247
       +
                 pgp-privkey = mkOption {

     

       248
       248
       +
                   type = types.str;

     

       249
       249
       +
                   description = ''

     

       250
       250
       +
                     An absolute file path (which should be outside the Nix-store)

     

       251
       251
       +
                     to an OpenPGP private key.

     

       247
       252
        
       

     

       248
       248
       -
                   Your PGP key information (DO NOT mix up pub and priv here)

     

       249
       249
       -
                   You must remove the password from your secret key, if present.

     

       250
       250
       -
                   You can do this with <code>gpg --edit-key [key-id]</code>,

     

       251
       251
       -
                   then use the <code>passwd</code> command and do not enter a new password.

     

       252
       252
       -
                 '';

     

       253
       253
       -
                 pgp-pubkey = mkOptionNullOrStr "OpenPGP public key.";

     

       254
       254
       -
                 pgp-key-id = mkOptionNullOrStr "OpenPGP key identifier.";

     

       253
       253
       +
                     Your PGP key information (DO NOT mix up pub and priv here)

     

       254
       254
       +
                     You must remove the password from your secret key, if present.

     

       255
       255
       +
                     You can do this with <code>gpg --edit-key [key-id]</code>,

     

       256
       256
       +
                     then use the <code>passwd</code> command and do not enter a new password.

     

       257
       257
       +
                   '';

     

       258
       258
       +
                 };

     

       259
       259
       +
                 pgp-pubkey = mkOption {

     

       260
       260
       +
                   type = with types; either path str;

     

       261
       261
       +
                   description = "OpenPGP public key.";

     

       262
       262
       +
                 };

     

       263
       263
       +
                 pgp-key-id = mkOption {

     

       264
       264
       +
                   type = types.str;

     

       265
       265
       +
                   description = "OpenPGP key identifier.";

     

       266
       266
       +
                 };

     

       255
       267
        
               };

     

       256
       268
        
               options.objects = {

     

       257
       269
        
                 s3-upstream = mkOption {

+39

nixos/tests/sourcehut.nix

···

       169
       169
        
               oauth-client-id = "d07cb713d920702e";

     

       170
       170
        
             };

     

       171
       171
        
             settings.webhooks.private-key = pkgs.writeText "webhook-key" "Ra3IjxgFiwG9jxgp4WALQIZw/BMYt30xWiOsqD0J7EA=";

     

       172
       172
       +
             settings.mail = {

     

       173
       173
       +
               smtp-from = "root+hut@${domain}";

     

       174
       174
       +
               # WARNING: take care to keep pgp-privkey outside the Nix store in production,

     

       175
       175
       +
               # or use LoadCredentialEncrypted=

     

       176
       176
       +
               pgp-privkey = toString (pkgs.writeText "sourcehut.pgp-privkey" ''

     

       177
       177
       +
                 -----BEGIN PGP PRIVATE KEY BLOCK-----

     

       178
       178
       +
       

     

       179
       179
       +
                 lFgEYqDRORYJKwYBBAHaRw8BAQdAehGoy36FUx2OesYm07be2rtLyvR5Pb/ltstd

     

       180
       180
       +
                 Gk7hYQoAAP9X4oPmxxrHN8LewBpWITdBomNqlHoiP7mI0nz/BOPJHxEktDZuaXhv

     

       181
       181
       +
                 cy90ZXN0cy9zb3VyY2VodXQgPHJvb3QraHV0QHNvdXJjZWh1dC5sb2NhbGRvbWFp

     

       182
       182
       +
                 bj6IlwQTFgoAPxYhBPqjgjnL8RHN4JnADNicgXaYm0jJBQJioNE5AhsDBQkDwmcA

     

       183
       183
       +
                 BgsJCAcDCgUVCgkICwUWAwIBAAIeBQIXgAAKCRDYnIF2mJtIySVCAP9e2nHsVHSi

     

       184
       184
       +
                 2B1YGZpVG7Xf36vxljmMkbroQy+0gBPwRwEAq+jaiQqlbGhQ7R/HMFcAxBIVsq8h

     

       185
       185
       +
                 Aw1rngsUd0o3dAicXQRioNE5EgorBgEEAZdVAQUBAQdAXZV2Sd5ZNBVTBbTGavMv

     

       186
       186
       +
                 D6ORrUh8z7TI/3CsxCE7+yADAQgHAAD/c1RU9xH+V/uI1fE7HIn/zL0LUPpsuce2

     

       187
       187
       +
                 cH++g4u3kBgTOYh+BBgWCgAmFiEE+qOCOcvxEc3gmcAM2JyBdpibSMkFAmKg0TkC

     

       188
       188
       +
                 GwwFCQPCZwAACgkQ2JyBdpibSMlKagD/cTre6p1m8QuJ7kwmCFRSz5tBzIuYMMgN

     

       189
       189
       +
                 xtT7dmS91csA/35fWsOykSiFRojQ7ccCSUTHL7ApF2EbL968tP/D2hIG

     

       190
       190
       +
                 =Hjoc

     

       191
       191
       +
                 -----END PGP PRIVATE KEY BLOCK-----

     

       192
       192
       +
               '');

     

       193
       193
       +
               pgp-pubkey = pkgs.writeText "sourcehut.pgp-pubkey" ''

     

       194
       194
       +
                 -----BEGIN PGP PUBLIC KEY BLOCK-----

     

       195
       195
       +
       

     

       196
       196
       +
                 mDMEYqDRORYJKwYBBAHaRw8BAQdAehGoy36FUx2OesYm07be2rtLyvR5Pb/ltstd

     

       197
       197
       +
                 Gk7hYQq0Nm5peG9zL3Rlc3RzL3NvdXJjZWh1dCA8cm9vdCtodXRAc291cmNlaHV0

     

       198
       198
       +
                 LmxvY2FsZG9tYWluPoiXBBMWCgA/FiEE+qOCOcvxEc3gmcAM2JyBdpibSMkFAmKg

     

       199
       199
       +
                 0TkCGwMFCQPCZwAGCwkIBwMKBRUKCQgLBRYDAgEAAh4FAheAAAoJENicgXaYm0jJ

     

       200
       200
       +
                 JUIA/17acexUdKLYHVgZmlUbtd/fq/GWOYyRuuhDL7SAE/BHAQCr6NqJCqVsaFDt

     

       201
       201
       +
                 H8cwVwDEEhWyryEDDWueCxR3Sjd0CLg4BGKg0TkSCisGAQQBl1UBBQEBB0BdlXZJ

     

       202
       202
       +
                 3lk0FVMFtMZq8y8Po5GtSHzPtMj/cKzEITv7IAMBCAeIfgQYFgoAJhYhBPqjgjnL

     

       203
       203
       +
                 8RHN4JnADNicgXaYm0jJBQJioNE5AhsMBQkDwmcAAAoJENicgXaYm0jJSmoA/3E6

     

       204
       204
       +
                 3uqdZvELie5MJghUUs+bQcyLmDDIDcbU+3ZkvdXLAP9+X1rDspEohUaI0O3HAklE

     

       205
       205
       +
                 xy+wKRdhGy/evLT/w9oSBg==

     

       206
       206
       +
                 =pJD7

     

       207
       207
       +
                 -----END PGP PUBLIC KEY BLOCK-----

     

       208
       208
       +
               '';

     

       209
       209
       +
               pgp-key-id = "0xFAA38239CBF111CDE099C00CD89C8176989B48C9";

     

       210
       210
       +
             };

     

       172
       211
        
           };

     

       173
       212
        
       

     

       174
       213
        
           networking.firewall.allowedTCPPorts = [ 443 ];