diff --git a/install.sh b/install.sh index 31dc326..4b29aee 100755 --- a/install.sh +++ b/install.sh @@ -10,13 +10,8 @@ EXTRA_INCLUDE_FILE=$4 if [ "$USE_MYSQL" = "true" ]; then DB_TYPE="mysql" DB_SERVER="127.0.0.1" + # We need to start MySQL, but not sqlite sudo systemctl start mysql - sudo mysqladmin processlist - systemctl status mysql - # sudo systemctl start mysql - echo "going to create the database" - # mysql -u root -e "CREATE DATABASE mw" - # for file in /usr/share/mysql/*; do printf '%s\n' "$file"; sudo cat "$file"; done else DB_TYPE="sqlite" DB_SERVER="localhost" @@ -24,9 +19,11 @@ fi # Install composer dependencies cd mediawiki && composer install + +# We can have --dbpass with 'root' for MySQL without breaking SQLite since +# the SQLite installer just clears that, it doesn't use a password php maintenance/install.php \ --dbtype $DB_TYPE \ - --dbserver $DB_SERVER \ --dbpass 'root' \ --dbuser root \ --dbname mw \