From 7dab80b491a67ae4d13a5498a4aa9c5158771daf Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Tue, 2 May 2023 14:24:45 -0400 Subject: [PATCH] docs: update default server ports --- .nfpm/soft-serve.conf | 4 ++-- Dockerfile | 6 ++++++ README.md | 6 +++--- docker.md | 8 ++++---- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.nfpm/soft-serve.conf b/.nfpm/soft-serve.conf index c830b114f6bd7de056817b25fb2c5e6c3929c4a0..b51e4466d7b050656de633d7d7ccc95eaa571c21 100644 --- a/.nfpm/soft-serve.conf +++ b/.nfpm/soft-serve.conf @@ -2,8 +2,8 @@ # Keys defined in `SOFT_SERVE_INITIAL_ADMIN_KEYS` will be merged with # the `initial_admin_keys` from /var/lib/soft-serve/config.yaml. # -#SOFT_SERVE_HTTP_LISTEN_ADDR=:8080 #SOFT_SERVE_GIT_LISTEN_ADDR=:9418 +#SOFT_SERVE_HTTP_LISTEN_ADDR=:23232 #SOFT_SERVE_SSH_LISTEN_ADDR=:23231 -#SOFT_SERVE_SSH_KEY_PATH=ssh/soft_serve_host +#SOFT_SERVE_SSH_KEY_PATH=ssh/soft_serve_host_ed25519 #SOFT_SERVE_INITIAL_ADMIN_KEYS='ssh-ed25519 AAAAC3NzaC1lZDI1...' diff --git a/Dockerfile b/Dockerfile index b82dd514877b2b24b9f3614618db6bf6794c0db4..dfb7d4e318ffd574a91b7b2caa8bc7e6a4d09dc0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,12 @@ ENV SOFT_SERVE_INITIAL_ADMIN_KEYS "" # Expose ports # SSH EXPOSE 23231/tcp +# HTTP +EXPOSE 23232/tcp +# Stats +EXPOSE 23233/tcp +# Git +EXPOSE 9418/tcp # Set the default command ENTRYPOINT [ "/usr/local/bin/soft", "serve" ] diff --git a/README.md b/README.md index d2bb3df495dc6849863e99f4ecffd4b37599599e..54abb9e0a58c3ab89861f84801f28a543d82d04f 100644 --- a/README.md +++ b/README.md @@ -171,7 +171,7 @@ git: # The HTTP server configuration. http: # The address on which the HTTP server will listen. - listen_addr: ":8080" + listen_addr: ":23232" # The path to the TLS private key. tls_key_path: "" @@ -182,12 +182,12 @@ http: # The public URL of the HTTP server. # This is the address that will be used to clone repositories. # Make sure to use https:// if you are using TLS. - public_url: "http://localhost:8080" + public_url: "http://localhost:23232" # The stats server configuration. stats: # The address on which the stats server will listen. - listen_addr: ":8081" + listen_addr: ":23233" # Additional admin keys. #initial_admin_keys: diff --git a/docker.md b/docker.md index 32cadde9c90ba07fa4773c9d62f0bbe3756fa15d..5f840e20457f4212a326b2d43c8716f538c111c3 100644 --- a/docker.md +++ b/docker.md @@ -15,9 +15,9 @@ docker run \ --name=soft-serve \ --volume /path/to/data:/soft-serve \ --publish 23231:23231 \ + --publish 23232:23232 \ + --publish 23233:23233 \ --publish 9418:9418 \ - --publish 8080:8080 \ - --publish 8081:8081 \ --restart unless-stopped \ charmcli/soft-serve:latest ``` @@ -35,9 +35,9 @@ services: - /path/to/data:/soft-serve ports: - 23231:23231 + - 23232:23232 + - 23233:23233 - 9418:9418 - - 8080:8080 - - 8081:8081 restart: unless-stopped ```