commit 6be37ef79f05ad7d4846a18ea9ebf78ff39d6928 · dunkirk.sh/dots

+22

flake.lock

···

       37
       37
        
               "type": "github"

     

       38
       38
        
             }

     

       39
       39
        
           },

     

       40
       40
       +
           "battleship-arena": {

     

       41
       41
       +
             "inputs": {

     

       42
       42
       +
               "nixpkgs": [

     

       43
       43
       +
                 "nixpkgs"

     

       44
       44
       +
               ]

     

       45
       45
       +
             },

     

       46
       46
       +
             "locked": {

     

       47
       47
       +
               "lastModified": 1764790763,

     

       48
       48
       +
               "narHash": "sha256-zeitWozGRMpBXpv0w2JchhvijPceJ1ZBE18Y3j19je8=",

     

       49
       49
       +
               "owner": "taciturnaxolotl",

     

       50
       50
       +
               "repo": "battleship-arena",

     

       51
       51
       +
               "rev": "ea9ed8d601369a4fb29b92ea6f408f1610ac4280",

     

       52
       52
       +
               "type": "github"

     

       53
       53
       +
             },

     

       54
       54
       +
             "original": {

     

       55
       55
       +
               "owner": "taciturnaxolotl",

     

       56
       56
       +
               "repo": "battleship-arena",

     

       57
       57
       +
               "rev": "ea9ed8d601369a4fb29b92ea6f408f1610ac4280",

     

       58
       58
       +
               "type": "github"

     

       59
       59
       +
             }

     

       60
       60
       +
           },

     

       40
       61
        
           "catppuccin": {

     

       41
       62
        
             "inputs": {

     

       42
       63
        
               "nixpkgs": [

     
···

       1055
       1076
        
           "root": {

     

       1056
       1077
        
             "inputs": {

     

       1057
       1078
        
               "agenix": "agenix",

     

       1079
       1079
       +
               "battleship-arena": "battleship-arena",

     

       1058
       1080
        
               "catppuccin": "catppuccin",

     

       1059
       1081
        
               "catppuccin-vsc": "catppuccin-vsc",

     

       1060
       1082
        
               "cedarlogic": "cedarlogic",

flake.nix

···

       104
       104
        
             url = "git+https://tangled.org/tangled.org/core";

     

       105
       105
        
             inputs.nixpkgs.follows = "nixpkgs";

     

       106
       106
        
           };

     

       107
       107
       +
       

     

       108
       108
       +
           battleship-arena = {

     

       109
       109
       +
             url = "github:taciturnaxolotl/battleship-arena/ea9ed8d601369a4fb29b92ea6f408f1610ac4280";

     

       110
       110
       +
             inputs.nixpkgs.follows = "nixpkgs";

     

       111
       111
       +
           };

     

       107
       112
        
         };

     

       108
       113
        
       

     

       109
       114
        
         outputs =

+26

machines/terebithia/default.nix

···

       123
       123
        
             file = ../../secrets/github-knot-sync.age;

     

       124
       124
        
             owner = "git";

     

       125
       125
        
           };

     

       126
       126
       +
           battleship-arena = {

     

       127
       127
       +
             file = ../../secrets/battleship-arena.age;

     

       128
       128
       +
             owner = "battleship-arena";

     

       129
       129
       +
           };

     

       126
       130
        
         };

     

       127
       131
        
       

     

       128
       132
        
         environment.sessionVariables = {

     
···

       246
       250
        
               }

     

       247
       251
        
             '';

     

       248
       252
        
           };

     

       253
       253
       +
           virtualHosts."battleship.dunkirk.sh" = {

     

       254
       254
       +
             extraConfig = ''

     

       255
       255
       +
               tls {

     

       256
       256
       +
                 dns cloudflare {env.CLOUDFLARE_API_TOKEN}

     

       257
       257
       +
               }

     

       258
       258
       +
               header {

     

       259
       259
       +
                 Strict-Transport-Security "max-age=31536000; includeSubDomains; preload"

     

       260
       260
       +
               }

     

       261
       261
       +
               reverse_proxy localhost:8081 {

     

       262
       262
       +
                 header_up X-Forwarded-Proto {scheme}

     

       263
       263
       +
                 header_up X-Forwarded-For {remote}

     

       264
       264
       +
               }

     

       265
       265
       +
             '';

     

       266
       266
       +
           };

     

       249
       267
        
           extraConfig = ''

     

       250
       268
        
             # Default response for unhandled domains

     

       251
       269
        
             :80 {

     
···

       277
       295
        
           enable = true;

     

       278
       296
        
           domain = "emojibot.dunkirk.sh";

     

       279
       297
        
           secretsFile = config.age.secrets.emojibot.path;

     

       298
       298
       +
         };

     

       299
       299
       +
       

     

       300
       300
       +
         atelier.services.battleship-arena = {

     

       301
       301
       +
           enable = true;

     

       302
       302
       +
           domain = "battleship.dunkirk.sh";

     

       303
       303
       +
           sshPort = 2222;

     

       304
       304
       +
           package = inputs.battleship-arena.packages.aarch64-linux.default;

     

       305
       305
       +
           secretsFile = config.age.secrets.battleship-arena.path;

     

       280
       306
        
         };

     

       281
       307
        
       

     

       282
       308
        
         services.tangled.knot = {

+120

modules/nixos/services/battleship-arena.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         cfg = config.atelier.services.battleship-arena;

     

       7
       7
       +
       in

     

       8
       8
       +
       {

     

       9
       9
       +
         options.atelier.services.battleship-arena = {

     

       10
       10
       +
           enable = mkEnableOption "battleship-arena service";

     

       11
       11
       +
       

     

       12
       12
       +
           domain = mkOption {

     

       13
       13
       +
             type = types.str;

     

       14
       14
       +
             default = "battleship.dunkirk.sh";

     

       15
       15
       +
             description = "Domain name for the web interface";

     

       16
       16
       +
           };

     

       17
       17
       +
       

     

       18
       18
       +
           sshPort = mkOption {

     

       19
       19
       +
             type = types.port;

     

       20
       20
       +
             default = 2222;

     

       21
       21
       +
             description = "SSH port for battleship arena";

     

       22
       22
       +
           };

     

       23
       23
       +
       

     

       24
       24
       +
           webPort = mkOption {

     

       25
       25
       +
             type = types.port;

     

       26
       26
       +
             default = 8081;

     

       27
       27
       +
             description = "Web interface port";

     

       28
       28
       +
           };

     

       29
       29
       +
       

     

       30
       30
       +
           uploadDir = mkOption {

     

       31
       31
       +
             type = types.str;

     

       32
       32
       +
             default = "/var/lib/battleship-arena/submissions";

     

       33
       33
       +
             description = "Directory for uploaded submissions";

     

       34
       34
       +
           };

     

       35
       35
       +
       

     

       36
       36
       +
           resultsDb = mkOption {

     

       37
       37
       +
             type = types.str;

     

       38
       38
       +
             default = "/var/lib/battleship-arena/results.db";

     

       39
       39
       +
             description = "Path to results database";

     

       40
       40
       +
           };

     

       41
       41
       +
       

     

       42
       42
       +
           adminPasscode = mkOption {

     

       43
       43
       +
             type = types.str;

     

       44
       44
       +
             default = "battleship-admin-override";

     

       45
       45
       +
             description = "Admin passcode for batch uploads";

     

       46
       46
       +
           };

     

       47
       47
       +
       

     

       48
       48
       +
           secretsFile = mkOption {

     

       49
       49
       +
             type = types.nullOr types.path;

     

       50
       50
       +
             default = null;

     

       51
       51
       +
             description = "Path to agenix secrets file containing BATTLESHIP_ADMIN_PASSCODE";

     

       52
       52
       +
           };

     

       53
       53
       +
       

     

       54
       54
       +
           package = mkOption {

     

       55
       55
       +
             type = types.package;

     

       56
       56
       +
             description = "The battleship-arena package to use";

     

       57
       57
       +
           };

     

       58
       58
       +
         };

     

       59
       59
       +
       

     

       60
       60
       +
         config = mkIf cfg.enable {

     

       61
       61
       +
           users.users.battleship-arena = {

     

       62
       62
       +
             isSystemUser = true;

     

       63
       63
       +
             group = "battleship-arena";

     

       64
       64
       +
             home = "/var/lib/battleship-arena";

     

       65
       65
       +
             createHome = true;

     

       66
       66
       +
           };

     

       67
       67
       +
       

     

       68
       68
       +
           users.groups.battleship-arena = {};

     

       69
       69
       +
       

     

       70
       70
       +
           systemd.services.battleship-arena = {

     

       71
       71
       +
             description = "Battleship Arena SSH/Web Service";

     

       72
       72
       +
             after = [ "network.target" ];

     

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

     

       74
       74
       +
       

     

       75
       75
       +
             environment = {

     

       76
       76
       +
               BATTLESHIP_HOST = "0.0.0.0";

     

       77
       77
       +
               BATTLESHIP_SSH_PORT = toString cfg.sshPort;

     

       78
       78
       +
               BATTLESHIP_WEB_PORT = toString cfg.webPort;

     

       79
       79
       +
               BATTLESHIP_UPLOAD_DIR = cfg.uploadDir;

     

       80
       80
       +
               BATTLESHIP_RESULTS_DB = cfg.resultsDb;

     

       81
       81
       +
               BATTLESHIP_ADMIN_PASSCODE = cfg.adminPasscode;

     

       82
       82
       +
               BATTLESHIP_EXTERNAL_URL = "https://${cfg.domain}";

     

       83
       83
       +
             };

     

       84
       84
       +
       

     

       85
       85
       +
             serviceConfig = {

     

       86
       86
       +
               Type = "simple";

     

       87
       87
       +
               User = "battleship-arena";

     

       88
       88
       +
               Group = "battleship-arena";

     

       89
       89
       +
               WorkingDirectory = "/var/lib/battleship-arena";

     

       90
       90
       +
               ExecStart = "${cfg.package}/bin/battleship-arena";

     

       91
       91
       +
               Restart = "always";

     

       92
       92
       +
               RestartSec = "10s";

     

       93
       93
       +
       

     

       94
       94
       +
               # Load secrets if provided

     

       95
       95
       +
               EnvironmentFile = mkIf (cfg.secretsFile != null) cfg.secretsFile;

     

       96
       96
       +
       

     

       97
       97
       +
               # Security hardening

     

       98
       98
       +
               NoNewPrivileges = true;

     

       99
       99
       +
               PrivateTmp = true;

     

       100
       100
       +
               ProtectSystem = "strict";

     

       101
       101
       +
               ProtectHome = true;

     

       102
       102
       +
               ReadWritePaths = [ "/var/lib/battleship-arena" ];

     

       103
       103
       +
             };

     

       104
       104
       +
       

     

       105
       105
       +
             preStart = ''

     

       106
       106
       +
               mkdir -p ${cfg.uploadDir}

     

       107
       107
       +
               mkdir -p $(dirname ${cfg.resultsDb})

     

       108
       108
       +
               

     

       109
       109
       +
               # Generate SSH host key if it doesn't exist

     

       110
       110
       +
               if [ ! -f /var/lib/battleship-arena/.ssh/battleship_arena ]; then

     

       111
       111
       +
                 mkdir -p /var/lib/battleship-arena/.ssh

     

       112
       112
       +
                 ${pkgs.openssh}/bin/ssh-keygen -t ed25519 -f /var/lib/battleship-arena/.ssh/battleship_arena -N ""

     

       113
       113
       +
                 chown -R battleship-arena:battleship-arena /var/lib/battleship-arena/.ssh

     

       114
       114
       +
               fi

     

       115
       115
       +
             '';

     

       116
       116
       +
           };

     

       117
       117
       +
       

     

       118
       118
       +
           networking.firewall.allowedTCPPorts = [ cfg.sshPort ];

     

       119
       119
       +
         };

     

       120
       120
       +
       }

secrets/battleship-arena.age

This is a binary file and will not be displayed.

secrets/secrets.nix

···

       38
       38
        
         "emojibot.age".publicKeys = [

     

       39
       39
        
           kierank

     

       40
       40
        
         ];

     

       41
       41
       +
         "battleship-arena.age".publicKeys = [

     

       42
       42
       +
           kierank

     

       43
       43
       +
         ];

     

       41
       44
        
       }