commit 249b4ad942811160ea22aaa772283e991cc9329f · pyrox.dev/nixpkgs

+10

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

···

       263
       263
        
              <literal>false</literal>.

     

       264
       264
        
            </para>

     

       265
       265
        
          </listitem>

     

       266
       266
       +
          <listitem>

     

       267
       267
       +
            <para>

     

       268
       268
       +
              The <option>services.systemhealth</option> module has been removed from nixpkgs due to lack of maintainer.

     

       269
       269
       +
            </para>

     

       270
       270
       +
          </listitem>

     

       271
       271
       +
          <listitem>

     

       272
       272
       +
            <para>

     

       273
       273
       +
              The <option>services.mantisbt</option> module has been removed from nixpkgs due to lack of maintainer.

     

       274
       274
       +
            </para>

     

       275
       275
       +
          </listitem>

     

       266
       276
        
         </itemizedlist>

     

       267
       277
        
        </section>

     

       268
       278

-2

nixos/modules/module-list.nix

···

       437
       437
        
         ./services/misc/logkeys.nix

     

       438
       438
        
         ./services/misc/leaps.nix

     

       439
       439
        
         ./services/misc/lidarr.nix

     

       440
       440
       -
         ./services/misc/mantisbt.nix

     

       441
       440
        
         ./services/misc/mathics.nix

     

       442
       441
        
         ./services/misc/matrix-synapse.nix

     

       443
       442
        
         ./services/misc/mbpfan.nix

     
···

       522
       521
        
         ./services/monitoring/scollector.nix

     

       523
       522
        
         ./services/monitoring/smartd.nix

     

       524
       523
        
         ./services/monitoring/sysstat.nix

     

       525
       525
       -
         ./services/monitoring/systemhealth.nix

     

       526
       524
        
         ./services/monitoring/teamviewer.nix

     

       527
       525
        
         ./services/monitoring/telegraf.nix

     

       528
       526
        
         ./services/monitoring/thanos.nix

+24 -30

nixos/modules/services/logging/awstats.nix

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         cfg = config.services.awstats;

     

       7
       7
       +
         httpd = config.services.httpd;

     

       7
       8
        
         package = pkgs.awstats;

     

       8
       9
        
       in

     

       9
       10
        
       

     
···

       67
       68
        
           environment.etc."awstats/awstats.conf".source = pkgs.runCommand "awstats.conf"

     

       68
       69
        
             { preferLocalBuild = true; }

     

       69
       70
        
             ( let

     

       70
       70
       -
                 cfg-httpd = config.services.httpd;

     

       71
       71
        
                 logFormat =

     

       72
       72
       -
                   if cfg-httpd.logFormat == "combined" then "1" else

     

       73
       73
       -
                   if cfg-httpd.logFormat == "common" then "4" else

     

       74
       74
       -
                   throw "awstats service doesn't support Apache log format `${cfg-httpd.logFormat}`";

     

       72
       72
       +
                   if httpd.logFormat == "combined" then "1" else

     

       73
       73
       +
                   if httpd.logFormat == "common" then "4" else

     

       74
       74
       +
                   throw "awstats service doesn't support Apache log format `${httpd.logFormat}`";

     

       75
       75
        
               in

     

       76
       76
        
               ''

     

       77
       77
        
                 sed \

     

       78
       78
        
                   -e 's|^\(DirData\)=.*$|\1="${cfg.vardir}"|' \

     

       79
       79
        
                   -e 's|^\(DirIcons\)=.*$|\1="icons"|' \

     

       80
       80
        
                   -e 's|^\(CreateDirDataIfNotExists\)=.*$|\1=1|' \

     

       81
       81
       -
                   -e 's|^\(SiteDomain\)=.*$|\1="${cfg-httpd.hostName}"|' \

     

       82
       82
       -
                   -e 's|^\(LogFile\)=.*$|\1="${cfg-httpd.logDir}/access_log"|' \

     

       81
       81
       +
                   -e 's|^\(SiteDomain\)=.*$|\1="${httpd.hostName}"|' \

     

       82
       82
       +
                   -e 's|^\(LogFile\)=.*$|\1="${httpd.logDir}/access_log"|' \

     

       83
       83
        
                   -e 's|^\(LogFormat\)=.*$|\1=${logFormat}|' \

     

       84
       84
        
                   < '${package.out}/wwwroot/cgi-bin/awstats.model.conf' > "$out"

     

       85
       85
        
                 echo '${cfg.extraConfig}' >> "$out"

     

       86
       86
        
               '');

     

       87
       87
        
       

     

       88
       88
       +
           systemd.tmpfiles.rules = optionals cfg.service.enable [

     

       89
       89
       +
             "d '${cfg.vardir}' - ${httpd.user} ${httpd.group} - -"

     

       90
       90
       +
             "Z '${cfg.vardir}' - ${httpd.user} ${httpd.group} - -"

     

       91
       91
       +
           ];

     

       92
       92
       +
       

     

       88
       93
        
           # The httpd sub-service showing awstats.

     

       89
       89
       -
           services.httpd.enable = mkIf cfg.service.enable true;

     

       90
       90
       -
           services.httpd.extraSubservices = mkIf cfg.service.enable [ { function = { serverInfo, ... }: {

     

       91
       91
       -
             extraConfig =

     

       92
       92
       -
               ''

     

       93
       93
       -
                 Alias ${cfg.service.urlPrefix}/classes "${package.out}/wwwroot/classes/"

     

       94
       94
       -
                 Alias ${cfg.service.urlPrefix}/css "${package.out}/wwwroot/css/"

     

       95
       95
       -
                 Alias ${cfg.service.urlPrefix}/icons "${package.out}/wwwroot/icon/"

     

       96
       96
       -
                 ScriptAlias ${cfg.service.urlPrefix}/ "${package.out}/wwwroot/cgi-bin/"

     

       94
       94
       +
           services.httpd = optionalAttrs cfg.service.enable {

     

       95
       95
       +
             enable = true;

     

       96
       96
       +
             extraConfig = ''

     

       97
       97
       +
               Alias ${cfg.service.urlPrefix}/classes "${package.out}/wwwroot/classes/"

     

       98
       98
       +
               Alias ${cfg.service.urlPrefix}/css "${package.out}/wwwroot/css/"

     

       99
       99
       +
               Alias ${cfg.service.urlPrefix}/icons "${package.out}/wwwroot/icon/"

     

       100
       100
       +
               ScriptAlias ${cfg.service.urlPrefix}/ "${package.out}/wwwroot/cgi-bin/"

     

       97
       101
        
       

     

       98
       98
       -
                 <Directory "${package.out}/wwwroot">

     

       99
       99
       -
                   Options None

     

       100
       100
       -
                   AllowOverride None

     

       101
       101
       -
                   Order allow,deny

     

       102
       102
       -
                   Allow from all

     

       103
       103
       -
                 </Directory>

     

       104
       104
       -
               '';

     

       105
       105
       -
             startupScript =

     

       106
       106
       -
               let

     

       107
       107
       -
                 inherit (serverInfo.serverConfig) user group;

     

       108
       108
       -
               in pkgs.writeScript "awstats_startup.sh"

     

       109
       109
       -
                 ''

     

       110
       110
       -
                   mkdir -p '${cfg.vardir}'

     

       111
       111
       -
                   chown '${user}:${group}' '${cfg.vardir}'

     

       112
       112
       -
                 '';

     

       113
       113
       -
           };}];

     

       102
       102
       +
               <Directory "${package.out}/wwwroot">

     

       103
       103
       +
                 Options None

     

       104
       104
       +
                 Require all granted

     

       105
       105
       +
               </Directory>

     

       106
       106
       +
             '';

     

       107
       107
       +
           };

     

       114
       108
        
       

     

       115
       109
        
           systemd.services.awstats-update = mkIf (cfg.updateAt != null) {

     

       116
       110
        
             description = "awstats log collector";

-68

nixos/modules/services/misc/mantisbt.nix

···

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

     

       2
       2
       -
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       let

     

       5
       5
       -
         cfg = config.services.mantisbt;

     

       6
       6
       -
       

     

       7
       7
       -
         freshInstall = cfg.extraConfig == "";

     

       8
       8
       -
       

     

       9
       9
       -
         # combined code+config directory

     

       10
       10
       -
         mantisbt = let

     

       11
       11
       -
           config_inc = pkgs.writeText "config_inc.php" ("<?php\n" + cfg.extraConfig);

     

       12
       12
       -
           src = pkgs.fetchurl {

     

       13
       13
       -
             url = "mirror://sourceforge/mantisbt/${name}.tar.gz";

     

       14
       14
       -
             sha256 = "1pl6xn793p3mxc6ibpr2bhg85vkdlcf57yk7pfc399g47l8x4508";

     

       15
       15
       -
           };

     

       16
       16
       -
           name = "mantisbt-1.2.19";

     

       17
       17
       -
           in

     

       18
       18
       -
             # We have to copy every time; otherwise config won't be found.

     

       19
       19
       -
             pkgs.runCommand name

     

       20
       20
       -
               { preferLocalBuild = true; allowSubstitutes = false; }

     

       21
       21
       -
               (''

     

       22
       22
       -
                 mkdir -p "$out"

     

       23
       23
       -
                 cd "$out"

     

       24
       24
       -
                 tar -xf '${src}' --strip-components=1

     

       25
       25
       -
                 ln -s '${config_inc}' config_inc.php

     

       26
       26
       -
               ''

     

       27
       27
       -
               + lib.optionalString (!freshInstall) "rm -r admin/"

     

       28
       28
       -
               );

     

       29
       29
       -
       in

     

       30
       30
       -
       {

     

       31
       31
       -
         options.services.mantisbt = {

     

       32
       32
       -
           enable = mkOption {

     

       33
       33
       -
             type = types.bool;

     

       34
       34
       -
             default = false;

     

       35
       35
       -
             description = ''

     

       36
       36
       -
               Enable the mantisbt web service.

     

       37
       37
       -
               This switches on httpd with PHP and database.

     

       38
       38
       -
             '';

     

       39
       39
       -
           };

     

       40
       40
       -
           urlPrefix = mkOption {

     

       41
       41
       -
             type = types.string;

     

       42
       42
       -
             default = "/mantisbt";

     

       43
       43
       -
             description = "The URL prefix under which the mantisbt service appears.";

     

       44
       44
       -
           };

     

       45
       45
       -
           extraConfig = mkOption {

     

       46
       46
       -
             type = types.lines;

     

       47
       47
       -
             default = "";

     

       48
       48
       -
             description = ''

     

       49
       49
       -
               The contents of config_inc.php, without leading &lt;?php.

     

       50
       50
       -
               If left empty, the admin directory will be accessible.

     

       51
       51
       -
             '';

     

       52
       52
       -
           };

     

       53
       53
       -
         };

     

       54
       54
       -
       

     

       55
       55
       -
       

     

       56
       56
       -
         config = mkIf cfg.enable {

     

       57
       57
       -
           services.mysql.enable = true;

     

       58
       58
       -
           services.httpd.enable = true;

     

       59
       59
       -
           services.httpd.enablePHP = true;

     

       60
       60
       -
           # The httpd sub-service showing mantisbt.

     

       61
       61
       -
           services.httpd.extraSubservices = [ { function = { ... }: {

     

       62
       62
       -
             extraConfig =

     

       63
       63
       -
               ''

     

       64
       64
       -
                 Alias ${cfg.urlPrefix} "${mantisbt}"

     

       65
       65
       -
               '';

     

       66
       66
       -
           };}];

     

       67
       67
       -
         };

     

       68
       68
       -
       }

-133

nixos/modules/services/monitoring/systemhealth.nix

···

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

     

       2
       2
       -
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       5
       -
       let

     

       6
       6
       -
         cfg = config.services.systemhealth;

     

       7
       7
       -
       

     

       8
       8
       -
         systemhealth = with pkgs; stdenv.mkDerivation {

     

       9
       9
       -
           name = "systemhealth-1.0";

     

       10
       10
       -
           src = fetchurl {

     

       11
       11
       -
             url = "https://www.brianlane.com/downloads/systemhealth/systemhealth-1.0.tar.bz2";

     

       12
       12
       -
             sha256 = "1q69lz7hmpbdpbz36zb06nzfkj651413n9icx0njmyr3xzq1j9qy";

     

       13
       13
       -
           };

     

       14
       14
       -
           buildInputs = [ python ];

     

       15
       15
       -
           installPhase = ''

     

       16
       16
       -
             mkdir -p $out/bin

     

       17
       17
       -
             # Make it work for kernels 3.x, not so different than 2.6

     

       18
       18
       -
             sed -i 's/2\.6/4.0/' system_health.py

     

       19
       19
       -
             cp system_health.py $out/bin

     

       20
       20
       -
           '';

     

       21
       21
       -
         };

     

       22
       22
       -
       

     

       23
       23
       -
         rrdDir = "/var/lib/health/rrd";

     

       24
       24
       -
         htmlDir = "/var/lib/health/html";

     

       25
       25
       -
       

     

       26
       26
       -
         configFile = rrdDir + "/.syshealthrc";

     

       27
       27
       -
         # The program will try to read $HOME/.syshealthrc, so we set the proper home.

     

       28
       28
       -
         command = "HOME=${rrdDir} ${systemhealth}/bin/system_health.py";

     

       29
       29
       -
       

     

       30
       30
       -
         cronJob = ''

     

       31
       31
       -
           */5 * * * * wwwrun ${command} --log

     

       32
       32
       -
           5 * * * * wwwrun ${command} --graph

     

       33
       33
       -
         '';

     

       34
       34
       -
       

     

       35
       35
       -
         nameEqualName = s: "${s} = ${s}";

     

       36
       36
       -
         interfacesSection = concatStringsSep "\n" (map nameEqualName cfg.interfaces);

     

       37
       37
       -
       

     

       38
       38
       -
         driveLine = d: "${d.path} = ${d.name}";

     

       39
       39
       -
         drivesSection = concatStringsSep "\n" (map driveLine cfg.drives);

     

       40
       40
       -
       

     

       41
       41
       -
       in

     

       42
       42
       -
       {

     

       43
       43
       -
         options = {

     

       44
       44
       -
           services.systemhealth = {

     

       45
       45
       -
             enable = mkOption {

     

       46
       46
       -
               default = false;

     

       47
       47
       -
               description = ''

     

       48
       48
       -
                 Enable the system health monitor and its generation of graphs.

     

       49
       49
       -
               '';

     

       50
       50
       -
             };

     

       51
       51
       -
       

     

       52
       52
       -
             urlPrefix = mkOption {

     

       53
       53
       -
               default = "/health";

     

       54
       54
       -
               description = ''

     

       55
       55
       -
                 The URL prefix under which the System Health web pages appear in httpd.

     

       56
       56
       -
               '';

     

       57
       57
       -
             };

     

       58
       58
       -
       

     

       59
       59
       -
             interfaces = mkOption {

     

       60
       60
       -
               default = [ "lo" ];

     

       61
       61
       -
               example = [ "lo" "eth0" "eth1" ];

     

       62
       62
       -
               description = ''

     

       63
       63
       -
                 Interfaces to monitor (minimum one).

     

       64
       64
       -
               '';

     

       65
       65
       -
             };

     

       66
       66
       -
       

     

       67
       67
       -
             drives = mkOption {

     

       68
       68
       -
               default = [ ];

     

       69
       69
       -
               example = [ { name = "root"; path = "/"; } ];

     

       70
       70
       -
               description = ''

     

       71
       71
       -
                 Drives to monitor.

     

       72
       72
       -
               '';

     

       73
       73
       -
             };

     

       74
       74
       -
           };

     

       75
       75
       -
         };

     

       76
       76
       -
       

     

       77
       77
       -
         config = mkIf cfg.enable {

     

       78
       78
       -
           services.cron.systemCronJobs = [ cronJob ];

     

       79
       79
       -
       

     

       80
       80
       -
           system.activationScripts.systemhealth = stringAfter [ "var" ]

     

       81
       81
       -
             ''

     

       82
       82
       -
               mkdir -p ${rrdDir} ${htmlDir}

     

       83
       83
       -
               chown wwwrun:wwwrun ${rrdDir} ${htmlDir}

     

       84
       84
       -
       

     

       85
       85
       -
               cat >${configFile} << EOF

     

       86
       86
       -
               [paths]

     

       87
       87
       -
               rrdtool = ${pkgs.rrdtool}/bin/rrdtool

     

       88
       88
       -
               loadavg_rrd = loadavg

     

       89
       89
       -
               ps = /run/current-system/sw/bin/ps

     

       90
       90
       -
               df = /run/current-system/sw/bin/df

     

       91
       91
       -
               meminfo_rrd = meminfo

     

       92
       92
       -
               uptime_rrd = uptime

     

       93
       93
       -
               rrd_path = ${rrdDir}

     

       94
       94
       -
               png_path = ${htmlDir}

     

       95
       95
       -
       

     

       96
       96
       -
               [processes]

     

       97
       97
       -
       

     

       98
       98
       -
               [interfaces]

     

       99
       99
       -
               ${interfacesSection}

     

       100
       100
       -
       

     

       101
       101
       -
               [drives]

     

       102
       102
       -
               ${drivesSection}

     

       103
       103
       -
       

     

       104
       104
       -
               [graphs]

     

       105
       105
       -
               width = 400

     

       106
       106
       -
               time = ['-3hours', '-32hours', '-8days', '-5weeks', '-13months']

     

       107
       107
       -
               height = 100

     

       108
       108
       -
       

     

       109
       109
       -
               [external]

     

       110
       110
       -
       

     

       111
       111
       -
               EOF

     

       112
       112
       -
       

     

       113
       113
       -
               chown wwwrun:wwwrun ${configFile}

     

       114
       114
       -
       

     

       115
       115
       -
               ${pkgs.su}/bin/su -s "/bin/sh" -c "${command} --check" wwwrun

     

       116
       116
       -
               ${pkgs.su}/bin/su -s "/bin/sh" -c "${command} --html" wwwrun

     

       117
       117
       -
             '';

     

       118
       118
       -
       

     

       119
       119
       -
           services.httpd.extraSubservices = [

     

       120
       120
       -
             { function = f: {

     

       121
       121
       -
                 extraConfig = ''

     

       122
       122
       -
                   Alias ${cfg.urlPrefix} ${htmlDir}

     

       123
       123
       -
       

     

       124
       124
       -
                   <Directory ${htmlDir}>

     

       125
       125
       -
                       Order allow,deny

     

       126
       126
       -
                       Allow from all

     

       127
       127
       -
                   </Directory>

     

       128
       128
       -
                 '';

     

       129
       129
       -
               };

     

       130
       130
       -
             }

     

       131
       131
       -
           ];

     

       132
       132
       -
         };

     

       133
       133
       -
       }

+18 -23

nixos/tests/php-pcre.nix

···

       8
       8
        
           services.httpd = {

     

       9
       9
        
             enable = true;

     

       10
       10
        
             adminAddr = "please@dont.contact";

     

       11
       11
       -
             extraSubservices = lib.singleton {

     

       12
       12
       -
               function = f: {

     

       13
       13
       -
                 enablePHP = true;

     

       14
       14
       -
                 phpOptions = "pcre.jit = true";

     

       11
       11
       +
             enablePHP = true;

     

       12
       12
       +
             phpOptions = "pcre.jit = true";

     

       13
       13
       +
             extraConfig =

     

       14
       14
       +
             let

     

       15
       15
       +
               testRoot = pkgs.writeText "index.php"

     

       16
       16
       +
               ''

     

       17
       17
       +
                 <?php

     

       18
       18
       +
                   preg_match('/(${testString})/', '${testString}', $result);

     

       19
       19
       +
                   var_dump($result);

     

       20
       20
       +
                 ?>

     

       21
       21
       +
               '';

     

       22
       22
       +
             in

     

       23
       23
       +
               ''

     

       24
       24
       +
                 Alias / ${testRoot}/

     

       15
       25
        
       

     

       16
       16
       -
                 extraConfig =

     

       17
       17
       -
                 let

     

       18
       18
       -
                   testRoot = pkgs.writeText "index.php"

     

       19
       19
       -
                   ''

     

       20
       20
       -
                     <?php

     

       21
       21
       -
                       preg_match('/(${testString})/', '${testString}', $result);

     

       22
       22
       -
                       var_dump($result);

     

       23
       23
       -
                     ?>

     

       24
       24
       -
                   '';

     

       25
       25
       -
                 in

     

       26
       26
       -
                   ''

     

       27
       27
       -
                     Alias / ${testRoot}/

     

       28
       28
       -
       

     

       29
       29
       -
                     <Directory ${testRoot}>

     

       30
       30
       -
                       Require all granted

     

       31
       31
       -
                     </Directory>

     

       32
       32
       -
                   '';

     

       33
       33
       -
               };

     

       34
       34
       -
             };

     

       26
       26
       +
                 <Directory ${testRoot}>

     

       27
       27
       +
                   Require all granted

     

       28
       28
       +
                 </Directory>

     

       29
       29
       +
               '';

     

       35
       30
        
           };

     

       36
       31
        
         };

     

       37
       32
        
         testScript = { ... }:

-121

nixos/tests/subversion.nix

···

       1
       1
       -
       import ./make-test.nix ({ pkgs, ...} : 

     

       2
       2
       -
       

     

       3
       3
       -
       let

     

       4
       4
       -
       

     

       5
       5
       -
         # Build some packages with coverage instrumentation.

     

       6
       6
       -
         overrides = pkgs:

     

       7
       7
       -
           with pkgs.stdenvAdapters;

     

       8
       8
       -
           let

     

       9
       9
       -
             do = pkg: pkg.override (args: {

     

       10
       10
       -
               stdenv = addCoverageInstrumentation args.stdenv;

     

       11
       11
       -
             });

     

       12
       12
       -
           in

     

       13
       13
       -
             rec {

     

       14
       14
       -
               apr = do pkgs.apr;

     

       15
       15
       -
               aprutil = do pkgs.aprutil;

     

       16
       16
       -
               apacheHttpd = do pkgs.apacheHttpd;

     

       17
       17
       -
               mod_python = do pkgs.mod_python;

     

       18
       18
       -
               subversion = do pkgs.subversion;

     

       19
       19
       -
       

     

       20
       20
       -
               # To build the kernel with coverage instrumentation, we need a

     

       21
       21
       -
               # special patch to make coverage data available under /proc.

     

       22
       22
       -
               linux = pkgs.linux.override (orig: {

     

       23
       23
       -
                 stdenv = overrideInStdenv pkgs.stdenv [ pkgs.keepBuildTree ];

     

       24
       24
       -
                 extraConfig =

     

       25
       25
       -
                   ''

     

       26
       26
       -
                     GCOV_KERNEL y

     

       27
       27
       -
                     GCOV_PROFILE_ALL y

     

       28
       28
       -
                   '';

     

       29
       29
       -
               });

     

       30
       30
       -
             };

     

       31
       31
       -
       

     

       32
       32
       -
       in

     

       33
       33
       -
       

     

       34
       34
       -
       {

     

       35
       35
       -
         name = "subversion";

     

       36
       36
       -
         meta = with pkgs.stdenv.lib.maintainers; {

     

       37
       37
       -
           maintainers = [ eelco ];

     

       38
       38
       -
         };

     

       39
       39
       -
       

     

       40
       40
       -
         nodes =

     

       41
       41
       -
           { webserver =

     

       42
       42
       -
               { ... }:

     

       43
       43
       -
       

     

       44
       44
       -
               {

     

       45
       45
       -
                 services.httpd.enable = true;

     

       46
       46
       -
                 services.httpd.adminAddr = "e.dolstra@tudelft.nl";

     

       47
       47
       -
                 services.httpd.extraSubservices =

     

       48
       48
       -
                   [ { function = import <services/subversion>;

     

       49
       49
       -
                       urlPrefix = "";

     

       50
       50
       -
                       dataDir = "/data/subversion";

     

       51
       51
       -
                       userCreationDomain = "192.168.0.0/16";

     

       52
       52
       -
                     }

     

       53
       53
       -
                   ];

     

       54
       54
       -
                 nixpkgs.config.packageOverrides = overrides;

     

       55
       55
       -
               };

     

       56
       56
       -
       

     

       57
       57
       -
             client =

     

       58
       58
       -
               { pkgs, ... }:

     

       59
       59
       -
       

     

       60
       60
       -
               {

     

       61
       61
       -
                 environment.systemPackages = [ pkgs.subversion ];

     

       62
       62
       -
                 nixpkgs.config.packageOverrides = overrides;

     

       63
       63
       -
               };

     

       64
       64
       -
       

     

       65
       65
       -
           };

     

       66
       66
       -
       

     

       67
       67
       -
         testScript =

     

       68
       68
       -
           ''

     

       69
       69
       -
             startAll;

     

       70
       70
       -
       

     

       71
       71
       -
             $webserver->waitForOpenPort(80);

     

       72
       72
       -
       

     

       73
       73
       -
             print STDERR $client->succeed("svn --version");

     

       74
       74
       -
       

     

       75
       75
       -
             print STDERR $client->succeed("curl --fail http://webserver/");

     

       76
       76
       -
       

     

       77
       77
       -
             # Create a new user through the web interface.

     

       78
       78
       -
             $client->succeed("curl --fail -F username=alice -F fullname='Alice Lastname' -F address=alice\@example.org -F password=foobar -F password_again=foobar http://webserver/repoman/adduser");

     

       79
       79
       -
       

     

       80
       80
       -
             # Let Alice create a new repository.

     

       81
       81
       -
             $client->succeed("curl --fail -u alice:foobar --form repo=xyzzy --form description=Xyzzy http://webserver/repoman/create");

     

       82
       82
       -
       

     

       83
       83
       -
             $client->succeed("curl --fail http://webserver/") =~ /alice/ or die;

     

       84
       84
       -
       

     

       85
       85
       -
             # Let Alice do a checkout.

     

       86
       86
       -
             my $svnFlags = "--non-interactive --username alice --password foobar";

     

       87
       87
       -
             $client->succeed("svn co $svnFlags http://webserver/repos/xyzzy wc");

     

       88
       88
       -
             $client->succeed("echo hello > wc/world");

     

       89
       89
       -
             $client->succeed("svn add wc/world");

     

       90
       90
       -
             $client->succeed("svn ci $svnFlags -m 'Added world.' wc/world");

     

       91
       91
       -
       

     

       92
       92
       -
             # Create a new user on the server through the create-user.pl script.

     

       93
       93
       -
             $webserver->execute("svn-server-create-user.pl bob bob\@example.org Bob");

     

       94
       94
       -
             $webserver->succeed("svn-server-resetpw.pl bob fnord");

     

       95
       95
       -
             $client->succeed("curl --fail http://webserver/") =~ /bob/ or die;

     

       96
       96
       -
       

     

       97
       97
       -
             # Bob should not have access to the repo.

     

       98
       98
       -
             my $svnFlagsBob = "--non-interactive --username bob --password fnord";

     

       99
       99
       -
             $client->fail("svn co $svnFlagsBob http://webserver/repos/xyzzy wc2");

     

       100
       100
       -
       

     

       101
       101
       -
             # Bob should not be able change the ACLs of the repo.

     

       102
       102
       -
             # !!! Repoman should really return a 403 here.

     

       103
       103
       -
             $client->succeed("curl --fail -u bob:fnord -F description=Xyzzy -F readers=alice,bob -F writers=alice -F watchers= -F tardirs= http://webserver/repoman/update/xyzzy")

     

       104
       104
       -
                 =~ /not authorised/ or die;

     

       105
       105
       -
       

     

       106
       106
       -
             # Give Bob access.

     

       107
       107
       -
             $client->succeed("curl --fail -u alice:foobar -F description=Xyzzy -F readers=alice,bob -F writers=alice -F watchers= -F tardirs= http://webserver/repoman/update/xyzzy");

     

       108
       108
       -
       

     

       109
       109
       -
             # So now his checkout should succeed.

     

       110
       110
       -
             $client->succeed("svn co $svnFlagsBob http://webserver/repos/xyzzy wc2");

     

       111
       111
       -
       

     

       112
       112
       -
             # Test ViewVC and WebSVN

     

       113
       113
       -
             $client->succeed("curl --fail -u alice:foobar http://webserver/viewvc/xyzzy");

     

       114
       114
       -
             $client->succeed("curl --fail -u alice:foobar http://webserver/websvn/xyzzy");

     

       115
       115
       -
             $client->succeed("curl --fail -u alice:foobar http://webserver/repos-xml/xyzzy");

     

       116
       116
       -
       

     

       117
       117
       -
             # Stop Apache to gather all the coverage data.

     

       118
       118
       -
             $webserver->stopJob("httpd");

     

       119
       119
       -
           '';

     

       120
       120
       -
       

     

       121
       121
       -
       })