| Index: trunk/tools/testswarm/scripts/testswarm-mw-fetcher-run.php |
| — | — | @@ -72,6 +72,12 @@ |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | $fetcher_conf = parse_ini_file( "/etc/testswarm/fetcher.ini", true ); |
| | 76 | + |
| | 77 | +// Fix up database file permission |
| | 78 | +$dbFile = "{$main->fetcher->paths['db']}/r{$rev}.sqlite"; |
| | 79 | +chgrp( $dbFile, $fetcher_conf['TestSwarmAPI']['wwwusergroup'] ); |
| | 80 | +chmod( $dbFile, "0664" ); |
| | 81 | + |
| 76 | 82 | $api = new TestSwarmAPI( |
| 77 | 83 | $main |
| 78 | 84 | , $fetcher_conf['TestSwarmAPI']['username'] |
| Index: trunk/tools/testswarm/scripts/fetcher-sample.ini |
| — | — | @@ -26,3 +26,8 @@ |
| 27 | 27 | |
| 28 | 28 | ; URL for your TestSwarm repository |
| 29 | 29 | url = "http://localhost/testswarm/" |
| | 30 | + |
| | 31 | +; User group your webserver is running under |
| | 32 | +; Debian : www-data |
| | 33 | +; Mac OS X: _www |
| | 34 | +wwwusergroup = "www-data" |
| Index: trunk/tools/testswarm/scripts/testswarm-mw-fetcher.php |
| — | — | @@ -138,8 +138,8 @@ |
| 139 | 139 | $this->debug( 'No next revision', __METHOD__ ); |
| 140 | 140 | } else { |
| 141 | 141 | // And install it |
| 142 | | - $fetcher = new TestSwarmMWFetcher( &$this, $nextRev ); |
| 143 | | - $result = $fetcher->run(); |
| | 142 | + $this->fetcher = new TestSwarmMWFetcher( &$this, $nextRev ); |
| | 143 | + $result = $this->fetcher->run(); |
| 144 | 144 | if( $result === true ) { |
| 145 | 145 | return $nextRev; |
| 146 | 146 | } |
| — | — | @@ -446,7 +446,7 @@ |
| 447 | 447 | |
| 448 | 448 | // Now simply run the CLI installer: |
| 449 | 449 | $cmd = "php {$this->paths['mw']}/maintenance/install.php \ |
| 450 | | - --dbname=testwarm_mw_r{$this->svnRevId} \ |
| | 450 | + --dbname=r{$this->svnRevId} \ |
| 451 | 451 | --dbtype=sqlite \ |
| 452 | 452 | --dbpath={$this->paths['db']} \ |
| 453 | 453 | --showexceptions=true \ |