| Index: branches/new-installer/phase3/includes/installer/Installer.i18n.php |
| — | — | @@ -227,11 +227,22 @@ |
| 228 | 228 | 'config-sqlite-name-help' => 'Choose a name that identifies your wiki. |
| 229 | 229 | Do not use spaces or hyphens. |
| 230 | 230 | This will be used for the SQLite data file name.', |
| 231 | | - 'config-sqlite-parent-unwritable' => 'Cannot create the data directory "$1" automatically, because the parent directory "$2" is not writable by the webserver. |
| | 231 | + 'config-sqlite-parent-unwritable-group' => 'Cannot create the data directory <code><nowiki>$1</nowiki></code>, because the parent directory <code><nowiki>$2</nowiki></code> is not writable by the webserver. |
| 232 | 232 | |
| 233 | | -To make the directory on a Unix/Linux system: |
| | 233 | +We\'ve determined the user your webserver is running as. Make the <code><nowiki>$3</nowiki></code> |
| | 234 | +directory writable by it to continue. On a Unix/Linux system do: |
| | 235 | + |
| 234 | 236 | <pre>cd $2 |
| 235 | 237 | mkdir $3 |
| | 238 | +chgrp $4 $3 |
| | 239 | +chmod g+w $3</pre>', |
| | 240 | + 'config-sqlite-parent-unwritable-nogroup' => 'Cannot create the data directory <code><nowiki>$1</nowiki></code>, because the parent directory <code><nowiki>$2</nowiki></code> is not writable by the webserver. |
| | 241 | + |
| | 242 | +We couldn\'t determine the user your webserver is running as. Make the <code><nowiki>$3</nowiki></code> |
| | 243 | +directory globally writable by it (and others!) to continue. On a Unix/Linux system do: |
| | 244 | + |
| | 245 | +<pre>cd $2 |
| | 246 | +mkdir $3 |
| 236 | 247 | chmod a+w $3</pre>', |
| 237 | 248 | 'config-sqlite-mkdir-error' => 'Error creating the data directory "$1". |
| 238 | 249 | Check the location and try again.', |
| — | — | @@ -565,9 +576,6 @@ |
| 566 | 577 | 'config-db-schema-help' => "De bovenstaande schema's kloppen meestal. |
| 567 | 578 | Wijzig ze alleen als u weet dat u ze nodig hebt.", |
| 568 | 579 | 'config-sqlite-dir' => 'Gegevensmap voor SQLite:', |
| 569 | | - 'config-sqlite-dir-help' => "SQLite slaat gegevens op in een bestand op het bestandssysteem. |
| 570 | | -Deze map moet beschrijfbaar zijn door de webserver. |
| 571 | | -De map mag '''niet''' via het web toegankelijk zijn.", |
| 572 | 580 | 'config-type-mysql' => 'MySQL', |
| 573 | 581 | 'config-type-postgres' => 'PostgreSQL', |
| 574 | 582 | 'config-type-sqlite' => 'SQLite', |
| Index: branches/new-installer/phase3/includes/installer/SqliteInstaller.php |
| — | — | @@ -46,7 +46,12 @@ |
| 47 | 47 | $this->setVar( 'wgSQLiteDataDir', $dir ); |
| 48 | 48 | if ( !is_dir( $dir ) ) { |
| 49 | 49 | if ( !is_writable( dirname( $dir ) ) ) { |
| 50 | | - return Status::newFatal( 'config-sqlite-parent-unwritable', $dir, dirname( $dir ), basename( $dir ) ); |
| | 50 | + $webserverGroup = Installer::maybeGetWebserverPrimaryGroup(); |
| | 51 | + if ( $webserverGroup !== null ) { |
| | 52 | + return Status::newFatal( 'config-sqlite-parent-unwritable-group', $dir, dirname( $dir ), basename( $dir ), $webserverGroup ); |
| | 53 | + } else { |
| | 54 | + return Status::newFatal( 'config-sqlite-parent-unwritable-nogroup', $dir, dirname( $dir ), basename( $dir ) ); |
| | 55 | + } |
| 51 | 56 | } |
| 52 | 57 | wfSuppressWarnings(); |
| 53 | 58 | $ok = wfMkdirParents( $dir, 0700 ); |