commit 54ac9e79da7f21019f9528302cab9f96689bfd06 · ryan.freumh.org/nixos

+4 -4

flake.lock

···

       134
       134
        
               ]

     

       135
       135
        
             },

     

       136
       136
        
             "locked": {

     

       137
       137
       -
               "lastModified": 1718115151,

     

       138
       138
       -
               "narHash": "sha256-ZRAqW9RixSTJjzGFQb7vvf95p1ns6WPmpxJQg/r4AYY=",

     

       137
       137
       +
               "lastModified": 1718119981,

     

       138
       138
       +
               "narHash": "sha256-HHIpsu4T/p4ESWpT5ka4WLbpEb1yqzKX5+JBYr02d8s=",

     

       139
       139
        
               "owner": "RyanGibb",

     

       140
       140
        
               "repo": "eilean-nix",

     

       141
       141
       -
               "rev": "b354949aac308b77d742c5a6321eac53508ab700",

     

       141
       141
       +
               "rev": "b24cfcf8b70ba94e844de7eb7584791a9e679c75",

     

       142
       142
        
               "type": "github"

     

       143
       143
        
             },

     

       144
       144
        
             "original": {

     

       145
       145
        
               "owner": "RyanGibb",

     

       146
       146
       -
               "ref": "eon-acme",

     

       146
       146
       +
               "ref": "main",

     

       147
       147
        
               "repo": "eilean-nix",

     

       148
       148
        
               "type": "github"

     

       149
       149
        
             }

+1 -1

flake.nix

···

       9
       9
        
           deploy-rs.url = "github:serokell/deploy-rs";

     

       10
       10
        
           nix-on-droid.url = "github:nix-community/nix-on-droid/release-23.11";

     

       11
       11
        
           eon.url = "github:RyanGibb/eon";

     

       12
       12
       -
           eilean.url = "github:RyanGibb/eilean-nix/eon-acme";

     

       12
       12
       +
           eilean.url = "github:RyanGibb/eilean-nix/main";

     

       13
       13
        
           ryan-website.url = "git+ssh://git@github.com/RyanGibb/website.git";

     

       14
       14
        
           alec-website.url = "github:alexanderhthompson/website";

     

       15
       15
        
           fn06-website.url = "github:RyanGibb/fn06";

+7 -7

hosts/duck/default.nix

···

       85
       85
        
               {

     

       86
       86
        
                 name = "@";

     

       87
       87
        
                 type = "NS";

     

       88
       88
       -
                 data = "ns";

     

       88
       88
       +
                 value = "ns";

     

       89
       89
        
               }

     

       90
       90
        
       

     

       91
       91
        
               {

     

       92
       92
        
                 name = "ns";

     

       93
       93
        
                 type = "A";

     

       94
       94
       -
                 data = ipv4;

     

       94
       94
       +
                 value = ipv4;

     

       95
       95
        
               }

     

       96
       96
        
               {

     

       97
       97
        
                 name = "ns";

     

       98
       98
        
                 type = "AAAA";

     

       99
       99
       -
                 data = ipv6;

     

       99
       99
       +
                 value = ipv6;

     

       100
       100
        
               }

     

       101
       101
        
       

     

       102
       102
        
               {

     

       103
       103
        
                 name = "@";

     

       104
       104
        
                 type = "A";

     

       105
       105
       -
                 data = ipv4;

     

       105
       105
       +
                 value = ipv4;

     

       106
       106
        
               }

     

       107
       107
        
               {

     

       108
       108
        
                 name = "@";

     

       109
       109
        
                 type = "AAAA";

     

       110
       110
       -
                 data = ipv6;

     

       110
       110
       +
                 value = ipv6;

     

       111
       111
        
               }

     

       112
       112
        
               {

     

       113
       113
        
                 name = "vps";

     

       114
       114
        
                 type = "A";

     

       115
       115
       -
                 data = ipv4;

     

       115
       115
       +
                 value = ipv4;

     

       116
       116
        
               }

     

       117
       117
        
               {

     

       118
       118
        
                 name = "vps";

     

       119
       119
        
                 type = "AAAA";

     

       120
       120
       -
                 data = ipv6;

     

       120
       120
       +
                 value = ipv6;

     

       121
       121
        
               }

     

       122
       122
        
             ];

     

       123
       123
        
           };

+29 -29

hosts/owl/default.nix

···

       109
       109
        
               {

     

       110
       110
        
                 name = "@";

     

       111
       111
        
                 type = "TXT";

     

       112
       112
       -
                 data =

     

       112
       112
       +
                 value =

     

       113
       113
        
                   "google-site-verification=rEvwSqf7RYKRQltY412qMtTuoxPp64O3L7jMotj9Jnc";

     

       114
       114
        
               }

     

       115
       115
        
               {

     

       116
       116
        
                 name = "teapot";

     

       117
       117
        
                 type = "CNAME";

     

       118
       118
       -
                 data = "vps";

     

       118
       118
       +
                 value = "vps";

     

       119
       119
        
               }

     

       120
       120
        
       

     

       121
       121
        
               {

     

       122
       122
        
                 name = "@";

     

       123
       123
        
                 type = "NS";

     

       124
       124
       -
                 data = "ns1.sirref.org.";

     

       124
       124
       +
                 value = "ns1.sirref.org.";

     

       125
       125
        
               }

     

       126
       126
        
       

     

       127
       127
        
               {

     

       128
       128
        
                 name = "@";

     

       129
       129
        
                 type = "A";

     

       130
       130
       -
                 data = config.eilean.serverIpv4;

     

       130
       130
       +
                 value = config.eilean.serverIpv4;

     

       131
       131
        
               }

     

       132
       132
        
               {

     

       133
       133
        
                 name = "@";

     

       134
       134
        
                 type = "AAAA";

     

       135
       135
       -
                 data = config.eilean.serverIpv6;

     

       135
       135
       +
                 value = config.eilean.serverIpv6;

     

       136
       136
        
               }

     

       137
       137
        
               {

     

       138
       138
        
                 name = "vps";

     

       139
       139
        
                 type = "A";

     

       140
       140
       -
                 data = config.eilean.serverIpv4;

     

       140
       140
       +
                 value = config.eilean.serverIpv4;

     

       141
       141
        
               }

     

       142
       142
        
               {

     

       143
       143
        
                 name = "vps";

     

       144
       144
        
                 type = "AAAA";

     

       145
       145
       -
                 data = config.eilean.serverIpv6;

     

       145
       145
       +
                 value = config.eilean.serverIpv6;

     

       146
       146
        
               }

     

       147
       147
        
       

     

       148
       148
        
               {

     

       149
       149
        
                 name = "@";

     

       150
       150
        
                 type = "LOC";

     

       151
       151
       -
                 data = "52 12 40.4 N 0 5 31.9 E 22m 10m 10m 10m";

     

       151
       151
       +
                 value = "52 12 40.4 N 0 5 31.9 E 22m 10m 10m 10m";

     

       152
       152
        
               }

     

       153
       153
        
       

     

       154
       154
        
               {

     

       155
       155
        
                 name = "ns.cl";

     

       156
       156
        
                 type = "A";

     

       157
       157
       -
                 data = "128.232.113.136";

     

       157
       157
       +
                 value = "128.232.113.136";

     

       158
       158
        
               }

     

       159
       159
        
               {

     

       160
       160
        
                 name = "cl";

     

       161
       161
        
                 type = "NS";

     

       162
       162
       -
                 data = "ns.cl";

     

       162
       162
       +
                 value = "ns.cl";

     

       163
       163
        
               }

     

       164
       164
        
       

     

       165
       165
        
               {

     

       166
       166
        
                 name = "ns1.eilean";

     

       167
       167
        
                 type = "A";

     

       168
       168
       -
                 data = "65.109.10.223";

     

       168
       168
       +
                 value = "65.109.10.223";

     

       169
       169
        
               }

     

       170
       170
        
               {

     

       171
       171
        
                 name = "eilean";

     

       172
       172
        
                 type = "NS";

     

       173
       173
       -
                 data = "ns1.eilean";

     

       173
       173
       +
                 value = "ns1.eilean";

     

       174
       174
        
               }

     

       175
       175
        
       

     

       176
       176
        
               {

     

       177
       177
        
                 name = "shrew";

     

       178
       178
        
                 type = "CNAME";

     

       179
       179
       -
                 data = "vps";

     

       179
       179
       +
                 value = "vps";

     

       180
       180
        
               }

     

       181
       181
        
       

     

       182
       182
        
               # generate with

     
···

       184
       184
        
               {

     

       185
       185
        
                 name = "_25._tcp.mail";

     

       186
       186
        
                 type = "TLSA";

     

       187
       187
       -
                 data =

     

       187
       187
       +
                 value =

     

       188
       188
        
                   "3 1 1 2f0fd413f063c75141937dd196a9f4ab66139d599e0dcf2a7ce6d557647e26a6";

     

       189
       189
        
               }

     

       190
       190
        
               # generate with

     
···

       194
       194
        
               {

     

       195
       195
        
                 name = "_25._tcp.mail";

     

       196
       196
        
                 type = "TLSA";

     

       197
       197
       -
                 data =

     

       197
       197
       +
                 value =

     

       198
       198
        
                   "2 1 1 8d02536c887482bc34ff54e41d2ba659bf85b341a0a20afadb5813dcfbcf286d";

     

       199
       199
        
               }

     

       200
       200
        
               # LE E1

     

       201
       201
        
               {

     

       202
       202
        
                 name = "_25._tcp.mail";

     

       203
       203
        
                 type = "TLSA";

     

       204
       204
       -
                 data =

     

       204
       204
       +
                 value =

     

       205
       205
        
                   "2 1 1 276fe8a8c4ec7611565bf9fce6dcace9be320c1b5bea27596b2204071ed04f10";

     

       206
       206
        
               }

     

       207
       207
        
               # LE R4

     

       208
       208
        
               {

     

       209
       209
        
                 name = "_25._tcp.mail";

     

       210
       210
        
                 type = "TLSA";

     

       211
       211
       -
                 data =

     

       211
       211
       +
                 value =

     

       212
       212
        
                   "2 1 1 e5545e211347241891c554a03934cde9b749664a59d26d615fe58f77990f2d03";

     

       213
       213
        
               }

     

       214
       214
        
               # LE E2

     

       215
       215
        
               {

     

       216
       216
        
                 name = "_25._tcp.mail";

     

       217
       217
        
                 type = "TLSA";

     

       218
       218
       -
                 data =

     

       218
       218
       +
                 value =

     

       219
       219
        
                   "2 1 1 bd936e72b212ef6f773102c6b77d38f94297322efc25396bc3279422e0c89270";

     

       220
       220
        
               }

     

       221
       221
        
             ];

     
···

       226
       226
        
               {

     

       227
       227
        
                 name = "@";

     

       228
       228
        
                 type = "NS";

     

       229
       229
       -
                 data = "ns1";

     

       229
       229
       +
                 value = "ns1";

     

       230
       230
        
               }

     

       231
       231
        
               {

     

       232
       232
        
                 name = "@";

     

       233
       233
        
                 type = "NS";

     

       234
       234
       -
                 data = "ns2";

     

       234
       234
       +
                 value = "ns2";

     

       235
       235
        
               }

     

       236
       236
        
       

     

       237
       237
        
               {

     

       238
       238
        
                 name = "ns1";

     

       239
       239
        
                 type = "A";

     

       240
       240
       -
                 data = config.eilean.serverIpv4;

     

       240
       240
       +
                 value = config.eilean.serverIpv4;

     

       241
       241
        
               }

     

       242
       242
        
               {

     

       243
       243
        
                 name = "ns1";

     

       244
       244
        
                 type = "AAAA";

     

       245
       245
       -
                 data = config.eilean.serverIpv6;

     

       245
       245
       +
                 value = config.eilean.serverIpv6;

     

       246
       246
        
               }

     

       247
       247
        
               {

     

       248
       248
        
                 name = "ns2";

     

       249
       249
        
                 type = "A";

     

       250
       250
       -
                 data = config.eilean.serverIpv4;

     

       250
       250
       +
                 value = config.eilean.serverIpv4;

     

       251
       251
        
               }

     

       252
       252
        
               {

     

       253
       253
        
                 name = "ns2";

     

       254
       254
        
                 type = "AAAA";

     

       255
       255
       -
                 data = config.eilean.serverIpv6;

     

       255
       255
       +
                 value = config.eilean.serverIpv6;

     

       256
       256
        
               }

     

       257
       257
        
       

     

       258
       258
        
               {

     

       259
       259
        
                 name = "@";

     

       260
       260
        
                 type = "A";

     

       261
       261
       -
                 data = config.eilean.serverIpv4;

     

       261
       261
       +
                 value = config.eilean.serverIpv4;

     

       262
       262
        
               }

     

       263
       263
        
               {

     

       264
       264
        
                 name = "@";

     

       265
       265
        
                 type = "AAAA";

     

       266
       266
       -
                 data = config.eilean.serverIpv6;

     

       266
       266
       +
                 value = config.eilean.serverIpv6;

     

       267
       267
        
               }

     

       268
       268
        
       

     

       269
       269
        
               {

     

       270
       270
        
                 name = "www.fn06.org.";

     

       271
       271
        
                 type = "CNAME";

     

       272
       272
       -
                 data = "fn06.org.";

     

       272
       272
       +
                 value = "fn06.org.";

     

       273
       273
        
               }

     

       274
       274
        
       

     

       275
       275
        
               {

     

       276
       276
        
                 name = "@";

     

       277
       277
        
                 type = "LOC";

     

       278
       278
       -
                 data = "52 12 40.4 N 0 5 31.9 E 22m 10m 10m 10m";

     

       278
       278
       +
                 value = "52 12 40.4 N 0 5 31.9 E 22m 10m 10m 10m";

     

       279
       279
        
               }

     

       280
       280
        
       

     

       281
       281
        
               {

     

       282
       282
        
                 name = "capybara.fn06.org.";

     

       283
       283
        
                 type = "CNAME";

     

       284
       284
       -
                 data = "fn06.org.";

     

       284
       284
       +
                 value = "fn06.org.";

     

       285
       285
        
               }

     

       286
       286
        
             ];

     

       287
       287
        
           };

+2 -2

modules/alec-website.nix

···

       66
       66
        
             {

     

       67
       67
        
               name = "${cfg.domain}.";

     

       68
       68
        
               type = "CNAME";

     

       69
       69
       -
               data = cfg.cname;

     

       69
       69
       +
               value = cfg.cname;

     

       70
       70
        
             }

     

       71
       71
        
             {

     

       72
       72
        
               name = "www.${cfg.domain}.";

     

       73
       73
        
               type = "CNAME";

     

       74
       74
       -
               data = cfg.cname;

     

       74
       74
       +
               value = cfg.cname;

     

       75
       75
        
             }

     

       76
       76
        
           ];

     

       77
       77
        
         };

+2 -2

modules/colour-guesser.nix

···

       37
       37
        
             {

     

       38
       38
        
               name = "${cfg.domain}.";

     

       39
       39
        
               type = "CNAME";

     

       40
       40
       -
               data = cfg.cname;

     

       40
       40
       +
               value = cfg.cname;

     

       41
       41
        
             }

     

       42
       42
        
             {

     

       43
       43
        
               name = "www.${cfg.domain}.";

     

       44
       44
        
               type = "CNAME";

     

       45
       45
       -
               data = cfg.cname;

     

       45
       45
       +
               value = cfg.cname;

     

       46
       46
        
             }

     

       47
       47
        
           ];

     

       48
       48
        
         };

+1 -1

modules/rmfakecloud.nix

···

       53
       53
        
           eilean.services.dns.zones.${config.networking.domain}.records = [{

     

       54
       54
        
             name = "rmfakecloud";

     

       55
       55
        
             type = "CNAME";

     

       56
       56
       -
             data = "vps";

     

       56
       56
       +
             value = "vps";

     

       57
       57
        
           }];

     

       58
       58
        
         };

     

       59
       59
        
       }

+2 -2

modules/ryan-website.nix

···

       69
       69
        
             {

     

       70
       70
        
               name = "${cfg.domain}.";

     

       71
       71
        
               type = "CNAME";

     

       72
       72
       -
               data = cfg.cname;

     

       72
       72
       +
               value = cfg.cname;

     

       73
       73
        
             }

     

       74
       74
        
             {

     

       75
       75
        
               name = "www.${cfg.domain}.";

     

       76
       76
        
               type = "CNAME";

     

       77
       77
       -
               data = cfg.cname;

     

       77
       77
       +
               value = cfg.cname;

     

       78
       78
        
             }

     

       79
       79
        
           ];

     

       80
       80
        
         };