Skip to content

docker: show smp-server init errors #1824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ap4sh wants to merge 1 commit into
base: stable
Choose a base branch
from
+4 −4
Open

docker: show smp-server init errors #1824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ On Linux, you can deploy smp and xftp server using Docker. This will download im

- `smp-server`

You must change **your_ip_or_domain**. `-e "pass=password"` is optional variable to password-protect your `smp` server:
You must change **your_ip_or_domain**. `-e "PASS=password"` is optional variable to password-protect your `smp` server. Passwords can contain printable ASCII characters except whitespace, `@`, `:` and `/`:
```sh
docker run -d \
-e "ADDR=your_ip_or_domain" \
Expand Down Expand Up @@ -188,7 +188,7 @@ On Linux, you can build smp server using Docker.

- `smp-server`

You must change **your_ip_or_domain**. `-e "pass=password"` is optional variable to password-protect your `smp` server:
You must change **your_ip_or_domain**. `-e "PASS=password"` is optional variable to password-protect your `smp` server. Passwords can contain printable ASCII characters except whitespace, `@`, `:` and `/`:
```sh
docker run -d \
-e "ADDR=your_ip_or_domain" \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/entrypoint-smp-server
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ if [ ! -f "${confd}/smp-server.ini" ]; then
--store-log \
--daily-stats \
--source-code \
"$@" > /dev/null 2>&1
"$@" > /dev/null

# Fix path to certificates
if [ -n "${WEB_MANUAL}" ]; then
Expand Down
2 changes: 1 addition & 1 deletion src/Simplex/Messaging/Server/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ smpServerCLI_ generateSite serveStaticFiles attachStaticFiles cfgPath logPath =
s ->
case strDecode $ encodeUtf8 $ T.pack s of
Right auth -> pure . Just $ ServerPassword auth
_ -> putStrLn "Invalid password. Only latin letters, digits and symbols other than '@' and ':' are allowed" >> serverPassword
_ -> putStrLn "Invalid password. Passwords can contain printable ASCII characters except whitespace, '@', ':' and '/'" >> serverPassword
checkInitOptions InitOptions {sourceCode, serverInfo, operatorCountry, hostingCountry} = do
let err_
| isNothing sourceCode && hasServerInfo serverInfo =
Expand Down