commit 5241e5a193f009bc8b1235904a8bc15cbe0e2c00 · pyrox.dev/nixpkgs

+10

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

···

       86
       86
        
       }</programlisting>

     

       87
       87
        
           </para>

     

       88
       88
        
          </listitem>

     

       89
       89
       +
          <listitem>

     

       90
       90
       +
           <para>

     

       91
       91
       +
             The <link linkend="opt-services.supybot.enable">supybot</link> module now uses <literal>/var/lib/supybot</literal>

     

       92
       92
       +
             as its default <link linkend="opt-services.supybot.stateDir">stateDir</link> path if <literal>stateVersion</literal>

     

       93
       93
       +
             is 20.09 or higher. It also enables number of

     

       94
       94
       +
             <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemd.exec.html#Sandboxing">systemd sandboxing options</link>

     

       95
       95
       +
             which may possibly interfere with some plugins. If this is the case you can disable the options through attributes in

     

       96
       96
       +
             <option>systemd.services.supybot.serviceConfig</option>.

     

       97
       97
       +
           </para>

     

       98
       98
       +
          </listitem>

     

       89
       99
        
         </itemizedlist>

     

       90
       100
        
        </section>

     

       91
       101

+92 -17

nixos/modules/services/networking/supybot.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       -
       

     

       7
       6
        
         cfg  = config.services.supybot;

     

       8
       8
       -
       

     

       7
       7
       +
         isStateDirHome = hasPrefix "/home/" cfg.stateDir;

     

       8
       8
       +
         isStateDirVar = cfg.stateDir == "/var/lib/supybot";

     

       9
       9
       +
         pyEnv = pkgs.python3.withPackages (p: [ p.limnoria ] ++ (cfg.extraPackages p));

     

       9
       10
        
       in

     

       10
       10
       -
       

     

       11
       11
        
       {

     

       12
       12
       -
       

     

       13
       12
        
         options = {

     

       14
       13
        
       

     

       15
       14
        
           services.supybot = {

     

       16
       15
        
       

     

       17
       16
        
             enable = mkOption {

     

       17
       17
       +
               type = types.bool;

     

       18
       18
        
               default = false;

     

       19
       19
       -
               description = "Enable Supybot, an IRC bot";

     

       19
       19
       +
               description = "Enable Supybot, an IRC bot (also known as Limnoria).";

     

       20
       20
        
             };

     

       21
       21
        
       

     

       22
       22
        
             stateDir = mkOption {

     

       23
       23
       -
               # Setting this to /var/lib/supybot caused useradd to fail

     

       24
       24
       -
               default = "/home/supybot";

     

       23
       23
       +
               type = types.path;

     

       24
       24
       +
               default = if versionAtLeast config.system.stateVersion "20.09"

     

       25
       25
       +
                 then "/var/lib/supybot"

     

       26
       26
       +
                 else "/home/supybot";

     

       27
       27
       +
               defaultText = "/var/lib/supybot";

     

       25
       28
        
               description = "The root directory, logs and plugins are stored here";

     

       26
       29
        
             };

     

       27
       30
        
       

     

       28
       31
        
             configFile = mkOption {

     

       29
       32
        
               type = types.path;

     

       30
       33
        
               description = ''

     

       31
       31
       -
                 Path to a supybot config file. This can be generated by

     

       34
       34
       +
                 Path to initial supybot config file. This can be generated by

     

       32
       35
        
                 running supybot-wizard.

     

       33
       36
        
       

     

       34
       37
        
                 Note: all paths should include the full path to the stateDir

     
···

       36
       39
        
               '';

     

       37
       40
        
             };

     

       38
       41
        
       

     

       42
       42
       +
             plugins = mkOption {

     

       43
       43
       +
               type = types.attrsOf types.path;

     

       44
       44
       +
               default = {};

     

       45
       45
       +
               description = ''

     

       46
       46
       +
                 Attribute set of additional plugins that will be symlinked to the

     

       47
       47
       +
                 <filename>plugin</filename> subdirectory.

     

       48
       48
       +
       

     

       49
       49
       +
                 Please note that you still need to add the plugins to the config

     

       50
       50
       +
                 file (or with <literal>!load</literal>) using their attribute name.

     

       51
       51
       +
               '';

     

       52
       52
       +
               example = literalExample ''

     

       53
       53
       +
                 let

     

       54
       54
       +
                   plugins = pkgs.fetchzip {

     

       55
       55
       +
                     url = "https://github.com/ProgVal/Supybot-plugins/archive/57c2450c.zip";

     

       56
       56
       +
                     sha256 = "077snf84ibnva3sbpzdfpfma6hcdw7dflwnhg6pw7mgnf0nd84qd";

     

       57
       57
       +
                   };

     

       58
       58
       +
                 in

     

       59
       59
       +
                 {

     

       60
       60
       +
                   Wikipedia = "''${plugins}/Wikipedia";

     

       61
       61
       +
                   Decide = ./supy-decide;

     

       62
       62
       +
                 }

     

       63
       63
       +
               '';

     

       64
       64
       +
             };

     

       65
       65
       +
       

     

       66
       66
       +
             extraPackages = mkOption {

     

       67
       67
       +
               default = p: [];

     

       68
       68
       +
               description = ''

     

       69
       69
       +
                 Extra Python packages available to supybot plugins. The

     

       70
       70
       +
                 value must be a function which receives the attrset defined

     

       71
       71
       +
                 in <varname>python3Packages</varname> as the sole argument.

     

       72
       72
       +
               '';

     

       73
       73
       +
               example = literalExample ''p: [ p.lxml p.requests ]'';

     

       74
       74
       +
             };

     

       75
       75
       +
       

     

       39
       76
        
           };

     

       40
       77
        
       

     

       41
       78
        
         };

     

       42
       79
        
       

     

       43
       43
       -
       

     

       44
       80
        
         config = mkIf cfg.enable {

     

       45
       81
        
       

     

       46
       46
       -
           environment.systemPackages = [ pkgs.pythonPackages.limnoria ];

     

       82
       82
       +
           environment.systemPackages = [ pkgs.python3Packages.limnoria ];

     

       47
       83
        
       

     

       48
       84
        
           users.users.supybot = {

     

       49
       85
        
             uid = config.ids.uids.supybot;

     

       50
       86
        
             group = "supybot";

     

       51
       87
        
             description = "Supybot IRC bot user";

     

       52
       88
        
             home = cfg.stateDir;

     

       53
       53
       -
             createHome = true;

     

       89
       89
       +
             isSystemUser = true;

     

       54
       90
        
           };

     

       55
       91
        
       

     

       56
       92
        
           users.groups.supybot = {

     
···

       59
       95
        
       

     

       60
       96
        
           systemd.services.supybot = {

     

       61
       97
        
             description = "Supybot, an IRC bot";

     

       98
       98
       +
             documentation = [ "https://limnoria.readthedocs.io/" ];

     

       62
       99
        
             after = [ "network.target" ];

     

       63
       100
        
             wantedBy = [ "multi-user.target" ];

     

       64
       64
       -
             path = [ pkgs.pythonPackages.limnoria ];

     

       65
       101
        
             preStart = ''

     

       66
       66
       -
               cd ${cfg.stateDir}

     

       67
       67
       -
               mkdir -p backup conf data plugins logs/plugins tmp web

     

       68
       68
       -
               ln -sf ${cfg.configFile} supybot.cfg

     

       69
       102
        
               # This needs to be created afresh every time

     

       70
       70
       -
               rm -f supybot.cfg.bak

     

       103
       103
       +
               rm -f '${cfg.stateDir}/supybot.cfg.bak'

     

       71
       104
        
             '';

     

       72
       105
        
       

     

       73
       106
        
             serviceConfig = {

     

       74
       74
       -
               ExecStart = "${pkgs.pythonPackages.limnoria}/bin/supybot ${cfg.stateDir}/supybot.cfg";

     

       107
       107
       +
               ExecStart = "${pyEnv}/bin/supybot ${cfg.stateDir}/supybot.cfg";

     

       75
       108
        
               PIDFile = "/run/supybot.pid";

     

       76
       109
        
               User = "supybot";

     

       77
       110
        
               Group = "supybot";

     
···

       79
       112
        
               Restart = "on-abort";

     

       80
       113
        
               StartLimitInterval = "5m";

     

       81
       114
        
               StartLimitBurst = "1";

     

       115
       115
       +
       

     

       116
       116
       +
               NoNewPrivileges = true;

     

       117
       117
       +
               PrivateDevices = true;

     

       118
       118
       +
               PrivateMounts = true;

     

       119
       119
       +
               PrivateTmp = true;

     

       120
       120
       +
               ProtectControlGroups = true;

     

       121
       121
       +
               ProtectKernelModules = true;

     

       122
       122
       +
               ProtectKernelTunables = true;

     

       123
       123
       +
               RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];

     

       124
       124
       +
               RestrictSUIDSGID = true;

     

       125
       125
       +
               SystemCallArchitectures = "native";

     

       126
       126
       +
               RestrictNamespaces = true;

     

       127
       127
       +
               RestrictRealtime = true;

     

       128
       128
       +
               LockPersonality = true;

     

       129
       129
       +
               MemoryDenyWriteExecute = true;

     

       130
       130
       +
               RemoveIPC = true;

     

       131
       131
       +
               ProtectHostname = true;

     

       132
       132
       +
               CapabilityBoundingSet = "";

     

       133
       133
       +
               ProtectSystem = "full";

     

       134
       134
       +
             }

     

       135
       135
       +
             // optionalAttrs isStateDirVar {

     

       136
       136
       +
               StateDirectory = "supybot";

     

       137
       137
       +
               ProtectSystem = "strict";

     

       138
       138
       +
             }

     

       139
       139
       +
             // optionalAttrs (!isStateDirHome) {

     

       140
       140
       +
               ProtectHome = true;

     

       82
       141
        
             };

     

       83
       142
        
           };

     

       143
       143
       +
       

     

       144
       144
       +
           systemd.tmpfiles.rules = [

     

       145
       145
       +
             "d '${cfg.stateDir}'              0700 supybot supybot - -"

     

       146
       146
       +
             "d '${cfg.stateDir}/backup'       0750 supybot supybot - -"

     

       147
       147
       +
             "d '${cfg.stateDir}/conf'         0750 supybot supybot - -"

     

       148
       148
       +
             "d '${cfg.stateDir}/data'         0750 supybot supybot - -"

     

       149
       149
       +
             "d '${cfg.stateDir}/plugins'      0750 supybot supybot - -"

     

       150
       150
       +
             "d '${cfg.stateDir}/logs'         0750 supybot supybot - -"

     

       151
       151
       +
             "d '${cfg.stateDir}/logs/plugins' 0750 supybot supybot - -"

     

       152
       152
       +
             "d '${cfg.stateDir}/tmp'          0750 supybot supybot - -"

     

       153
       153
       +
             "d '${cfg.stateDir}/web'          0750 supybot supybot - -"

     

       154
       154
       +
             "L '${cfg.stateDir}/supybot.cfg'  -    -       -       - ${cfg.configFile}"

     

       155
       155
       +
           ]

     

       156
       156
       +
           ++ (flip mapAttrsToList cfg.plugins (name: dest:

     

       157
       157
       +
             "L+ '${cfg.stateDir}/plugins/${name}' - - - - ${dest}"

     

       158
       158
       +
           ));

     

       84
       159
        
       

     

       85
       160
        
         };

     

       86
       161
        
       }