From 0e1596fe70d7b66247d793cd650456f6fdace25f Mon Sep 17 00:00:00 2001 From: don Pablo Date: Tue, 6 Jul 2021 23:44:08 +0200 Subject: [PATCH 1/3] fix: README link to 'config.default.yml' --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 65448ee..72b7cb8 100644 --- a/README.md +++ b/README.md @@ -174,8 +174,8 @@ You can specify configuration options either via a config file (default: `config | `mail.enabled` | `WAKAPI_MAIL_ENABLED` | `true` | Whether to allow Wakapi to send e-mail (e.g. for password resets) | | `mail.sender` | `WAKAPI_MAIL_SENDER` | `noreply@wakapi.dev` | Default sender address for outgoing mails (ignored for MailWhale) | | `mail.provider` | `WAKAPI_MAIL_PROVIDER` | `smtp` | Implementation to use for sending mails (one of [`smtp`, `mailwhale`]) | -| `mail.smtp.*` | `WAKAPI_MAIL_SMTP_*` | `-` | Various options to configure SMTP. See [default config](config.default.yaml) for details | -| `mail.mailwhale.*` | `WAKAPI_MAIL_MAILWHALE_*` | `-` | Various options to configure [MailWhale](https://mailwhale.dev) sending service. See [default config](config.default.yaml) for details | +| `mail.smtp.*` | `WAKAPI_MAIL_SMTP_*` | `-` | Various options to configure SMTP. See [default config](config.default.yml) for details | +| `mail.mailwhale.*` | `WAKAPI_MAIL_MAILWHALE_*` | `-` | Various options to configure [MailWhale](https://mailwhale.dev) sending service. See [default config](config.default.yml) for details | | `sentry.dsn` | `WAKAPI_SENTRY_DSN` | – | DSN for to integrate [Sentry](https://sentry.io) for error logging and tracing (leave empty to disable) | | `sentry.enable_tracing` | `WAKAPI_SENTRY_TRACING` | `false` | Whether to enable Sentry request tracing | | `sentry.sample_rate` | `WAKAPI_SENTRY_SAMPLE_RATE` | `0.75` | Probability of tracing a request in Sentry | From 74f6a255a8b52692ad33bb3ca2174f4ba78575d9 Mon Sep 17 00:00:00 2001 From: Steven Tang Date: Fri, 9 Jul 2021 16:17:50 +1000 Subject: [PATCH 2/3] feat: build/push arm64 Docker image --- .github/workflows/docker.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8dc07c4..632817d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -14,6 +14,9 @@ jobs: - name: Get version run: echo "GIT_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 @@ -38,6 +41,7 @@ jobs: tags: | n1try/wakapi:${{ env.GIT_TAG }} n1try/wakapi:latest + platforms: linux/amd64,linux/arm64 cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache @@ -49,5 +53,6 @@ jobs: tags: | n1try/wakapi:${{ env.GIT_TAG }}-alpine n1try/wakapi:latest-alpine + platforms: linux/amd64,linux/arm64 cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache From 47b9cacb26a3272d22a56110ae4ffacd02fc7067 Mon Sep 17 00:00:00 2001 From: Steven Tang Date: Sat, 10 Jul 2021 09:10:55 +0000 Subject: [PATCH 3/3] fix: remove unix socket if exists (#220) --- main.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/main.go b/main.go index 0287f09..262f808 100644 --- a/main.go +++ b/main.go @@ -268,6 +268,13 @@ func listen(handler http.Handler) { // UNIX domain socket if config.Server.ListenSocket != "" { + // Remove if exists + if _, err := os.Stat(config.Server.ListenSocket); err == nil { + logbuch.Info("--> Removing unix socket %s", config.Server.ListenSocket) + if err := os.Remove(config.Server.ListenSocket); err != nil { + logbuch.Fatal(err.Error()) + } + } sSocket = &http.Server{ Handler: handler, ReadTimeout: time.Duration(config.Server.TimeoutSec) * time.Second,