yeswiki/yeswiki-installer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(install) : handle curl with herse

Browse source
This commit is contained in:
mrflos 2023-02-03 22:08:34 +03:00
parent e85763f991
commit 5768569a2a
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
utils.inc.php
View file

@ -217,7 +217,7 @@ function removePhpFpmConfig($user)
exec('service '.$_SERVER['phpservice'].' reload', $output);
}
function copyYesWikiFiles($domain, $user, $dbUser)
function copyYesWikiFiles($domain, $user, $dbUser, $herseUser = null, $hersePass = null)
{
$tmpFile = '/tmp/yeswiki.zip';
$destDir = '/home'.'/'.$user.'/'.$domain;
@ -231,8 +231,11 @@ function copyYesWikiFiles($domain, $user, $dbUser)
exec($sudo.'mv '.$destDir.'/doryphore/* '.$destDir.'/');
exec($sudo.'rm -rf '.$destDir.'/doryphore');
unlink($tmpFile);
$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]=0\' --data-urlencode \'config[allow_raw_html]=1\' --data-urlencode \'config[allow_robots]=1\' --data-urlencode \'submit=Continue\' \'https://'.$domain.'/?PagePrincipale&installAction=install\' 2>&1';
$herse = '';
if (!empty($herseUser) && !empty($hersePass)) {
$herse = $herseUser.':'.$hersePass;
}
$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]=0\' --data-urlencode \'config[allow_raw_html]=1\' --data-urlencode \'config[allow_robots]=1\' --data-urlencode \'submit=Continue\' \'https://'.$herse.$domain.'/?PagePrincipale&installAction=install\' 2>&1';
$output = [];
exec($curl, $output);
//echo implode("\n", $output);
@ -260,6 +263,10 @@ function editConfigFile() {
}
function addExtensions() {
// ferme pour l'option ferme
}
function addStatistics() {
// requete SQL
// INSERT INTO `matomo_site` (`idsite`, `name`, `main_url`, `ts_created`, `ecommerce`, `sitesearch`, `sitesearch_keyword_parameters`, `sitesearch_category_parameters`, `timezone`, `currency`, `exclude_unknown_urls`, `excluded_ips`, `excluded_parameters`, `excluded_user_agents`, `excluded_referrers`, `group`, `type`, `keep_url_fragment`, `creator_login`) VALUES (NULL, 'Partage ton outil', 'https://partagetonoutil.fr', '2023-02-01 00:00:00', '0', '1', '', '', 'Europe/Paris', 'EUR', '0', '', '', '', '', '', 'website', '0', 'superadmin');

6
yeswiki-installer.php
View file

@ -76,7 +76,11 @@ if (0 == posix_getuid()) {
if ($confirm || $input->confirmed()) {
$unixUser = createUnixUserWithQuota($user, $quota);
$dbUser = createSQLUserAndDatabase($user, $type);
copyYesWikiFiles($domain, $user, $dbUser);
if ($needHerse) {
copyYesWikiFiles($domain, $user, $dbUser, $herseUser, $hersePass);
} else {
copyYesWikiFiles($domain, $user, $dbUser);
}
createNginxConfig($domain, $user, $herseUser, $hersePass);
createPhpFpmConfig($user);
$climate->shout(