From 9230eb162127fd5bf263636e1b7f2d5b58149947 Mon Sep 17 00:00:00 2001
From: kaetemi <jan.boon@kaetemi.be>
Date: Wed, 16 Jun 2021 00:28:02 +0800
Subject: [PATCH] Preconfigure web

---
 .../quick_start_win10/external/config.inc.php | 29 +++++++++++++++++++
 tool/quick_start_win10/external/nginx.bat     |  1 +
 .../quick_start_win10/external/web_config.bat |  2 +-
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 tool/quick_start_win10/external/config.inc.php

diff --git a/tool/quick_start_win10/external/config.inc.php b/tool/quick_start_win10/external/config.inc.php
new file mode 100644
index 000000000..795b9fd02
--- /dev/null
+++ b/tool/quick_start_win10/external/config.inc.php
@@ -0,0 +1,29 @@
+<?php
+/*
+ * Generated configuration file
+ * Generated by: phpMyAdmin 5.1.0 setup script
+ * Date: Sat, 12 Jun 2021 21:05:15 +0000
+ */
+
+/* Servers configuration */
+$i = 0;
+
+/* Server: localhost [1] */
+$i++;
+$cfg['Servers'][$i]['verbose'] = '';
+$cfg['Servers'][$i]['host'] = 'localhost';
+$cfg['Servers'][$i]['port'] = 9040;
+$cfg['Servers'][$i]['socket'] = '';
+$cfg['Servers'][$i]['auth_type'] = 'cookie';
+$cfg['Servers'][$i]['user'] = 'root';
+$cfg['Servers'][$i]['password'] = '';
+$cfg['Servers'][$i]['AllowNoPassword'] = true;
+
+/* End of servers configuration */
+
+$cfg['blowfish_secret'] = '@]$36/0i~1UD[EOCaJHcO;W9gd.SL1@';
+$cfg['DefaultLang'] = 'en';
+$cfg['ServerDefault'] = 1;
+$cfg['UploadDir'] = '';
+$cfg['SaveDir'] = '';
+?>
\ No newline at end of file
diff --git a/tool/quick_start_win10/external/nginx.bat b/tool/quick_start_win10/external/nginx.bat
index 0ff5ad9be..60b00ce01 100644
--- a/tool/quick_start_win10/external/nginx.bat
+++ b/tool/quick_start_win10/external/nginx.bat
@@ -2,6 +2,7 @@
 title NGINX
 echo NGINX on http://localhost:9042/
 if /I "%RC_ROOT%"=="" call ..\path_config.bat
+copy config.inc.php .\phpmyadmin\config.inc.php
 cd nginx
 for /f "usebackq delims=" %%i in (
   `powershell -noprofile -c "\"%RC_ROOT%\" -replace '\\', '/'"`
diff --git a/tool/quick_start_win10/external/web_config.bat b/tool/quick_start_win10/external/web_config.bat
index 20ee3919d..fc3ba33bb 100644
--- a/tool/quick_start_win10/external/web_config.bat
+++ b/tool/quick_start_win10/external/web_config.bat
@@ -1,5 +1,5 @@
 call ..\path_config.bat
 python web_config.py
 cd mariadb
-.\bin\mysql --port=9040 -u=root ..\web_config_local.sql
+.\bin\mysql -P 9040 -u root < ..\web_config_local.sql
 cd ..