commit f4ac3ac7e49e3a2096855a56943111441541c16c · pyrox.dev/nixpkgs

+42 -8

nixos/modules/services/monitoring/cockpit.nix

···

       49
       49
        
               '';

     

       50
       50
        
             };

     

       51
       51
        
       

     

       52
       52
       +
             showBanner = mkOption {

     

       53
       53
       +
               description = "Whether to add the Cockpit banner to the issue and motd files.";

     

       54
       54
       +
               type = types.bool;

     

       55
       55
       +
               default = true;

     

       56
       56
       +
               example = false;

     

       57
       57
       +
             };

     

       58
       58
       +
       

     

       52
       59
        
             port = mkOption {

     

       53
       60
        
               description = "Port where cockpit will listen.";

     

       54
       61
        
               type = types.port;

     
···

       62
       69
        
             };

     

       63
       70
        
           };

     

       64
       71
        
         };

     

       65
       65
       -
         config = mkIf cfg.enable {

     

       66
       72
        
       

     

       73
       73
       +
         config = mkIf cfg.enable {

     

       67
       74
        
           # expose cockpit-bridge system-wide

     

       68
       75
        
           environment.systemPackages = [ cfg.package ];

     

       69
       76
        
       

     

       70
       77
        
           # allow cockpit to find its plugins

     

       71
       78
        
           environment.pathsToLink = [ "/share/cockpit" ];

     

       72
       79
        
       

     

       73
       73
       -
           # generate cockpit settings

     

       74
       74
       -
           environment.etc."cockpit/cockpit.conf".source = settingsFormat.generate "cockpit.conf" cfg.settings;

     

       80
       80
       +
           environment.etc = {

     

       81
       81
       +
             # generate cockpit settings

     

       82
       82
       +
             "cockpit/cockpit.conf".source = settingsFormat.generate "cockpit.conf" cfg.settings;

     

       83
       83
       +
       

     

       84
       84
       +
             # Add "Web console: ..." line to issue and MOTD

     

       85
       85
       +
             "issue.d/cockpit.issue" = {

     

       86
       86
       +
               enable = cfg.showBanner;

     

       87
       87
       +
               source = "/run/cockpit/issue";

     

       88
       88
       +
             };

     

       89
       89
       +
             "motd.d/cockpit" = {

     

       90
       90
       +
               enable = cfg.showBanner;

     

       91
       91
       +
               source = "/run/cockpit/issue";

     

       92
       92
       +
             };

     

       93
       93
       +
           };

     

       75
       94
        
       

     

       76
       95
        
           security.pam.services.cockpit = {

     

       77
       96
        
             startSession = true;

     
···

       80
       99
        
           networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];

     

       81
       100
        
       

     

       82
       101
        
           systemd.packages = [ cfg.package ];

     

       83
       83
       -
           systemd.sockets.cockpit.wantedBy = [ "multi-user.target" ];

     

       84
       84
       -
           systemd.sockets.cockpit.listenStreams = [

     

       85
       85
       -
             "" # workaround so it doesn't listen on both ports caused by the runtime merging

     

       86
       86
       -
             (toString cfg.port)

     

       87
       87
       -
           ];

     

       102
       102
       +
       

     

       103
       103
       +
           systemd.sockets.cockpit = {

     

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

     

       105
       105
       +
             listenStreams = [

     

       106
       106
       +
               "" # workaround so it doesn't listen on both ports caused by the runtime merging

     

       107
       107
       +
               (toString cfg.port)

     

       108
       108
       +
             ];

     

       109
       109
       +
           };

     

       110
       110
       +
       

     

       111
       111
       +
           # Enable connecting to remote hosts from the login page

     

       112
       112
       +
           systemd.services = mkIf (cfg.settings ? LoginTo -> cfg.settings.LoginTo) {

     

       113
       113
       +
             "cockpit-wsinstance-http".path = [

     

       114
       114
       +
               config.programs.ssh.package

     

       115
       115
       +
               cfg.package

     

       116
       116
       +
             ];

     

       117
       117
       +
             "cockpit-wsinstance-https@".path = [

     

       118
       118
       +
               config.programs.ssh.package

     

       119
       119
       +
               cfg.package

     

       120
       120
       +
             ];

     

       121
       121
       +
           };

     

       88
       122
        
       

     

       89
       123
        
           systemd.tmpfiles.rules = [

     

       90
       124
        
             # From $out/lib/tmpfiles.d/cockpit-tmpfiles.conf

+11

pkgs/by-name/co/cockpit/branding.css

···

       1
       1
       +
       #badge {

     

       2
       2
       +
           inline-size: 225px;

     

       3
       3
       +
           block-size: 80px;

     

       4
       4
       +
           background-image: url("logo.png");

     

       5
       5
       +
           background-size: contain;

     

       6
       6
       +
           background-repeat: no-repeat;

     

       7
       7
       +
       }

     

       8
       8
       +
       

     

       9
       9
       +
       #brand::before {

     

       10
       10
       +
           content: "${PRETTY_NAME}";

     

       11
       11
       +
       }

+32 -2

pkgs/by-name/co/cockpit/package.nix

···

       37
       37
        
         systemd,

     

       38
       38
        
         udev,

     

       39
       39
        
         xmlto,

     

       40
       40
       +
         # Enables lightweight NixOS branding, replacing the default Cockpit icons

     

       41
       41
       +
         withBranding ? true,

     

       42
       42
       +
         nixos-icons,

     

       40
       43
        
       }:

     

       41
       44
        
       

     

       42
       45
        
       stdenv.mkDerivation (finalAttrs: {

     
···

       148
       151
        
       

     

       149
       152
        
           # hardcode libexecdir, I am assuming that cockpit only use it to find it's binaries

     

       150
       153
        
           printf 'def get_libexecdir() -> str:\n\treturn "%s"' "$out/libexec" >> src/cockpit/packages.py

     

       154
       154
       +
       

     

       155
       155
       +
           # patch paths used as visibility conditions in apps

     

       156
       156
       +
           substituteInPlace pkg/*/manifest.json \

     

       157
       157
       +
             --replace-warn '"/usr/bin' '"/run/current-system/sw/bin' \

     

       158
       158
       +
             --replace-warn '"/usr/sbin' '"/run/current-system/sw/bin' \

     

       159
       159
       +
             --replace-warn '"/usr/share' '"/run/current-system/sw/share' \

     

       160
       160
       +
             --replace-warn '"/lib/systemd' '"/run/current-system/sw/lib/systemd'

     

       161
       161
       +
       

     

       162
       162
       +
           # replace reference to system python interpreter, used for e.g. sosreport

     

       163
       163
       +
           substituteInPlace pkg/lib/python.ts \

     

       164
       164
       +
             --replace-fail /usr/libexec/platform-python ${python3Packages.python.interpreter}

     

       151
       165
        
         '';

     

       152
       166
        
       

     

       153
       167
        
         configureFlags = [

     
···

       200
       214
        
           substituteInPlace $out/lib/systemd/*/* \

     

       201
       215
        
             --replace-warn /bin /run/current-system/sw/bin

     

       202
       216
        
       

     

       217
       217
       +
           ${lib.optionalString withBranding ''

     

       218
       218
       +
             mkdir -p "$out/share/cockpit/branding/nixos"

     

       219
       219
       +
             pushd "$out/share/cockpit/branding/nixos"

     

       220
       220
       +
       

     

       221
       221
       +
             icons="${nixos-icons}/share/icons/hicolor"

     

       222
       222
       +
             ln -s "$icons/16x16/apps/nix-snowflake.png" favicon.ico

     

       223
       223
       +
             ln -s "$icons/256x256/apps/nix-snowflake.png" logo.png

     

       224
       224
       +
             ln -s "$icons/256x256/apps/nix-snowflake.png" apple-touch-icon.png

     

       225
       225
       +
             cp "${./branding.css}" branding.css

     

       226
       226
       +
       

     

       227
       227
       +
             popd

     

       228
       228
       +
           ''}

     

       229
       229
       +
       

     

       203
       230
        
           runHook postFixup

     

       204
       231
        
         '';

     

       205
       232
        
       

     
···

       219
       246
        
           export G_MESSAGES_DEBUG=cockpit-ws,cockpit-wrapper,cockpit-bridge

     

       220
       247
        
           export PATH=$PATH:$(pwd)

     

       221
       248
        
       

     

       222
       222
       -
           make check  -j$NIX_BUILD_CORES || true

     

       249
       249
       +
           make check -j$NIX_BUILD_CORES || true

     

       223
       250
        
           npm run eslint

     

       224
       251
        
           npm run stylelint

     

       225
       252
        
         '';

     
···

       235
       262
        
           homepage = "https://cockpit-project.org/";

     

       236
       263
        
           changelog = "https://cockpit-project.org/blog/cockpit-${finalAttrs.version}.html";

     

       237
       264
        
           license = lib.licenses.lgpl21;

     

       238
       238
       -
           maintainers = [ lib.maintainers.lucasew ];

     

       265
       265
       +
           maintainers = with lib.maintainers; [

     

       266
       266
       +
             lucasew

     

       267
       267
       +
             andre4ik3

     

       268
       268
       +
           ];

     

       239
       269
        
         };

     

       240
       270
        
       })