diff --git a/utils.inc.php b/utils.inc.php index cf93738..34f298d 100644 --- a/utils.inc.php +++ b/utils.inc.php @@ -233,9 +233,6 @@ function copyYesWikiFiles($domain, $user, $dbUser) exec($sudo.'rm -rf '.$destDir.'/doryphore'); unlink($tmpFile); - # we wait 10 seconds before launching install - echo "\nEn attente de dézippage (10 secondes)\n\n"; - exec('sleep 10'); $curl = 'curl -X POST --insecure --data-urlencode \'config[default_language]=fr\' --data-urlencode \'config[wakka_name]='.$domain.'\' --data-urlencode \'config[root_page]=PagePrincipale\' --data-urlencode \'config[mysql_host]=localhost\' --data-urlencode \'config[mysql_database]='.$dbUser['database'].'\' --data-urlencode \'config[mysql_user]='.$dbUser['user'].'\' --data-urlencode \'config[mysql_password]='.$dbUser['password'].'\' --data-urlencode \'config[table_prefix]=yeswiki_\' --data-urlencode \'admin_name='.$_SERVER['admin_id'].'\' --data-urlencode \'admin_password='.$_SERVER['admin_password'].'\' --data-urlencode \'admin_password_conf='.$_SERVER['admin_password'].'\' --data-urlencode \'admin_email='.$_SERVER['admin_email'].'\' --data-urlencode \'config[rewrite_mode]=1\' --data-urlencode \'submit=Continue\' \'https://'.$domain.'/?PagePrincipale&installAction=install\' 2>&1'; $output = []; exec($curl, $output); diff --git a/yeswiki-installer.php b/yeswiki-installer.php index 8adf24a..a634c64 100755 --- a/yeswiki-installer.php +++ b/yeswiki-installer.php @@ -76,9 +76,9 @@ if (0 == posix_getuid()) { if ($confirm || $input->confirmed()) { $unixUser = createUnixUserWithQuota($user, $quota); $dbUser = createSQLUserAndDatabase($user, $type); - copyYesWikiFiles($domain, $user, $dbUser); createNginxConfig($domain, $user, $herseUser, $hersePass); createPhpFpmConfig($user); + copyYesWikiFiles($domain, $user, $dbUser); $climate->shout( 'The yeswiki was successfully installed on '.$domain.', congrats ! 🎉'."\n" .' Unix user : '.$unixUser['user'].' with password : '.$unixUser['password'].' was created.'."\n"