From fb2c7799d5d2a8cb0d9ec55433b1222491c964d3 Mon Sep 17 00:00:00 2001 From: Yunkon Kim Date: Mon, 15 Jul 2024 09:41:31 +0900 Subject: [PATCH] Restore `.gitignore` and go version specified in `go.work` * Minor replace `ENABLE_AUTH` with `AUTH_ENABLED` in `docker-compose.yaml` --- .gitignore | 8 +------- conf/template-jwt_auth.yaml | 5 ----- docker-compose.yaml | 2 +- go.work | 4 ++-- 4 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 conf/template-jwt_auth.yaml diff --git a/.gitignore b/.gitignore index 43af91cb..7cc4e8a4 100644 --- a/.gitignore +++ b/.gitignore @@ -47,14 +47,8 @@ src/api/rest/docs/swagger.json src/api/rest/docs/swagger.yaml # Config file for CB-Tumblebug -!conf/ -conf/* +conf/ conf/credentials.conf -!conf/cloud_conf.yaml -!conf/log_conf.yaml -!conf/setup.env -!conf/store_conf.yaml -!conf/template-* # Runtime files src/benchmarking.csv diff --git a/conf/template-jwt_auth.yaml b/conf/template-jwt_auth.yaml deleted file mode 100644 index 0f0cdfdf..00000000 --- a/conf/template-jwt_auth.yaml +++ /dev/null @@ -1,5 +0,0 @@ -auth: - jwt: - signing: - method: xxx (e.g., RS256) - publickey: xxx diff --git a/docker-compose.yaml b/docker-compose.yaml index 810a2142..5ebf64ca 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -60,7 +60,7 @@ services: # - DB_USER=cb_tumblebug # - DB_PASSWORD=cb_tumblebug # - ALLOW_ORIGINS=* - # - ENABLE_AUTH=true + # - AUTH_ENABLED=true # - API_USERNAME=default # - API_PASSWORD=default # - AUTOCONTROL_DURATION_MS=10000 diff --git a/go.work b/go.work index 8a31c845..8820237f 100644 --- a/go.work +++ b/go.work @@ -1,5 +1,5 @@ -go 1.22.3 +go 1.21.6 -toolchain go1.22.5 +toolchain go1.21.6 use .