From 233af8cb55f88f07fcdbf0a212535804150bc115 Mon Sep 17 00:00:00 2001 From: Timo Schindler Date: Fri, 19 Jan 2018 10:10:51 +0100 Subject: [PATCH 1/5] added quote-hint for password to prevent erros parsing the .ini-file --- custom/conf/app.ini.sample | 3 +++ 1 file changed, 3 insertions(+) diff --git a/custom/conf/app.ini.sample b/custom/conf/app.ini.sample index a931ca4eaa75..919daf265be6 100644 --- a/custom/conf/app.ini.sample +++ b/custom/conf/app.ini.sample @@ -198,6 +198,7 @@ DB_TYPE = mysql HOST = 127.0.0.1:3306 NAME = gitea USER = root +; Use PASSWD = `your password` for quoting, if you use special characters in the password. PASSWD = ; For "postgres" only, either "disable", "require" or "verify-full" SSL_MODE = disable @@ -342,6 +343,7 @@ KEY_FILE = custom/mailer/key.pem FROM = ; Mailer user name and password USER = +; Use PASSWD = `your password` for quoting, if you use special characters in the password. PASSWD = ; Send mails as plain text SEND_AS_PLAIN_TEXT = false @@ -464,6 +466,7 @@ SUBJECT = Diagnostic message from server HOST = ; Mailer user name and password USER = +; Use PASSWD = `your password` for quoting, if you use special characters in the password. PASSWD = ; Receivers, can be one or more, e.g. 1@example.com,2@example.com RECEIVERS = From ffc976d1fcec6fb57048ac6d41f0abd85bb8b949 Mon Sep 17 00:00:00 2001 From: Timo Schindler Date: Fri, 19 Jan 2018 10:11:36 +0100 Subject: [PATCH 2/5] added quote-hint for password in documentation --- docs/content/doc/advanced/config-cheat-sheet.en-us.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md index 941e08a7eab9..e737133cf9fa 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -118,7 +118,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`. - `HOST`: **127.0.0.1:3306**: Database host address and port. - `NAME`: **gitea**: Database name. - `USER`: **root**: Database username. -- `PASSWD`: **\**: Database user password. +- `PASSWD`: **\`\\`**: Database user password. Use \`your password\` for quoting, if you use special characters in the password. - `SSL_MODE`: **disable**: For PostgreSQL only. - `PATH`: **data/gitea.db**: For SQLite3 only, the database file path. @@ -185,7 +185,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`. - `FROM`: **\**: Mail from address, RFC 5322. This can be just an email address, or the "Name" \ format. - `USER`: **\**: Username of mailing user (usually the sender's e-mail address). -- `PASSWD`: **\**: Password of mailing user. +- `PASSWD`: **\`\\`**: Password of mailing user. Use \`your password\` for quoting, if you use special characters in the password. - `SKIP_VERIFY`: **\**: Do not verify the self-signed certificates. - **Note:** Gitea only supports SMTP with STARTTLS. - `USE_SENDMAIL`: **false** Use the operating system's `sendmail` command instead of SMTP. From 44fe67c59cffb74a0ce05ef42443413173a25f8f Mon Sep 17 00:00:00 2001 From: Timo Schindler Date: Fri, 19 Jan 2018 17:57:21 +0100 Subject: [PATCH 3/5] removed quotes from --- docs/content/doc/advanced/config-cheat-sheet.en-us.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md index e737133cf9fa..5ce60c4d5556 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -118,7 +118,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`. - `HOST`: **127.0.0.1:3306**: Database host address and port. - `NAME`: **gitea**: Database name. - `USER`: **root**: Database username. -- `PASSWD`: **\`\\`**: Database user password. Use \`your password\` for quoting, if you use special characters in the password. +- `PASSWD`: **\**: Database user password. Use \`your password\` for quoting, if you use special characters in the password. - `SSL_MODE`: **disable**: For PostgreSQL only. - `PATH`: **data/gitea.db**: For SQLite3 only, the database file path. @@ -185,7 +185,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`. - `FROM`: **\**: Mail from address, RFC 5322. This can be just an email address, or the "Name" \ format. - `USER`: **\**: Username of mailing user (usually the sender's e-mail address). -- `PASSWD`: **\`\\`**: Password of mailing user. Use \`your password\` for quoting, if you use special characters in the password. +- `PASSWD`: **\**: Password of mailing user. Use \`your password\` for quoting, if you use special characters in the password. - `SKIP_VERIFY`: **\**: Do not verify the self-signed certificates. - **Note:** Gitea only supports SMTP with STARTTLS. - `USE_SENDMAIL`: **false** Use the operating system's `sendmail` command instead of SMTP. From 1d73277270596b907c8f2b0c9a5bcb38a2387c4c Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Sat, 27 Jan 2018 20:09:30 +0200 Subject: [PATCH 4/5] Remove unneeded commas --- custom/conf/app.ini.sample | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/custom/conf/app.ini.sample b/custom/conf/app.ini.sample index 919daf265be6..9bfa841b7397 100644 --- a/custom/conf/app.ini.sample +++ b/custom/conf/app.ini.sample @@ -198,7 +198,7 @@ DB_TYPE = mysql HOST = 127.0.0.1:3306 NAME = gitea USER = root -; Use PASSWD = `your password` for quoting, if you use special characters in the password. +; Use PASSWD = `your password` for quoting if you use special characters in the password. PASSWD = ; For "postgres" only, either "disable", "require" or "verify-full" SSL_MODE = disable @@ -343,7 +343,7 @@ KEY_FILE = custom/mailer/key.pem FROM = ; Mailer user name and password USER = -; Use PASSWD = `your password` for quoting, if you use special characters in the password. +; Use PASSWD = `your password` for quoting if you use special characters in the password. PASSWD = ; Send mails as plain text SEND_AS_PLAIN_TEXT = false @@ -466,7 +466,7 @@ SUBJECT = Diagnostic message from server HOST = ; Mailer user name and password USER = -; Use PASSWD = `your password` for quoting, if you use special characters in the password. +; Use PASSWD = `your password` for quoting if you use special characters in the password. PASSWD = ; Receivers, can be one or more, e.g. 1@example.com,2@example.com RECEIVERS = From 005670402069ec4baab8fff66bcfe134f29527a2 Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Sat, 27 Jan 2018 20:10:43 +0200 Subject: [PATCH 5/5] Remove unneeded commas also in docs --- docs/content/doc/advanced/config-cheat-sheet.en-us.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md index 5ce60c4d5556..6f3a51c58ccf 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -118,7 +118,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`. - `HOST`: **127.0.0.1:3306**: Database host address and port. - `NAME`: **gitea**: Database name. - `USER`: **root**: Database username. -- `PASSWD`: **\**: Database user password. Use \`your password\` for quoting, if you use special characters in the password. +- `PASSWD`: **\**: Database user password. Use \`your password\` for quoting if you use special characters in the password. - `SSL_MODE`: **disable**: For PostgreSQL only. - `PATH`: **data/gitea.db**: For SQLite3 only, the database file path. @@ -185,7 +185,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`. - `FROM`: **\**: Mail from address, RFC 5322. This can be just an email address, or the "Name" \ format. - `USER`: **\**: Username of mailing user (usually the sender's e-mail address). -- `PASSWD`: **\**: Password of mailing user. Use \`your password\` for quoting, if you use special characters in the password. +- `PASSWD`: **\**: Password of mailing user. Use \`your password\` for quoting if you use special characters in the password. - `SKIP_VERIFY`: **\**: Do not verify the self-signed certificates. - **Note:** Gitea only supports SMTP with STARTTLS. - `USE_SENDMAIL`: **false** Use the operating system's `sendmail` command instead of SMTP.