From d5a317caee12bc38348eade19e004a29cf2788c6 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 28 Apr 2025 12:24:34 -0700 Subject: [PATCH 1/3] save settings on load --- server/service/settingsService.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/service/settingsService.js b/server/service/settingsService.js index 840f15e84..1443755f9 100755 --- a/server/service/settingsService.js +++ b/server/service/settingsService.js @@ -55,6 +55,8 @@ class SettingsService { this.settings[key] = dbSettings[key]; } } + + await this.appSettings.updateOne({}, { $set: this.settings }, { upsert: true }); return this.settings; } catch (error) { error.service === undefined ? (error.service = SERVICE_NAME) : null; From aebba27dc79fc187a52f538fb4d31f8dcc0343ae Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 28 Apr 2025 12:25:02 -0700 Subject: [PATCH 2/3] fix mogno connection string --- docker/dist/docker-compose.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docker/dist/docker-compose.yaml b/docker/dist/docker-compose.yaml index 051f8ae25..0f2b603ed 100755 --- a/docker/dist/docker-compose.yaml +++ b/docker/dist/docker-compose.yaml @@ -18,13 +18,14 @@ services: - redis - mongodb environment: - - DB_CONNECTION_STRING=mongodb://localhost:27017/uptime_db?replicaSet=rs0 - - REDIS_URL="redis://redis:6379" + - DB_CONNECTION_STRING=mongodb://mongodb:27017/uptime_db?replicaSet=rs0 + - REDIS_URL=redis://redis:6379 - CLIENT_HOST=http://localhost + - JWT_SECRET=my_secret # volumes: # - /var/run/docker.sock:/var/run/docker.sock:ro redis: - image: bluewaveuptime/uptime_redis:latest + image: ghcr.io/bluewave-labs/checkmate:redis-dist restart: always ports: - "6379:6379" @@ -37,11 +38,11 @@ services: retries: 5 start_period: 5s mongodb: - image: bluewaveuptime/uptime_database_mongo:latest + image: ghcr.io/bluewave-labs/checkmate:mongo-dist restart: always volumes: - ./mongo/data:/data/db - command: ["mongod", "--quiet"] + command: ["mongod", "--quiet", "--replSet", "rs0", "--bind_ip_all"] ports: - "27017:27017" healthcheck: From c8d41212d5778c7f62980a80c0bf479242a63b48 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 28 Apr 2025 12:25:24 -0700 Subject: [PATCH 3/3] remove unused scripts --- docker/dist/mongo/init/create_users.js | 16 ---------------- docker/dist/mongo/init/init_replica_set.js | 15 --------------- 2 files changed, 31 deletions(-) delete mode 100755 docker/dist/mongo/init/create_users.js delete mode 100644 docker/dist/mongo/init/init_replica_set.js diff --git a/docker/dist/mongo/init/create_users.js b/docker/dist/mongo/init/create_users.js deleted file mode 100755 index adb2bf078..000000000 --- a/docker/dist/mongo/init/create_users.js +++ /dev/null @@ -1,16 +0,0 @@ -var username = process.env.USERNAME_ENV_VAR; -var password = process.env.PASSWORD_ENV_VAR; - -db = db.getSiblingDB("uptime_db"); - -db.createUser({ - user: username, - pwd: password, - roles: [ - { - role: "readWrite", - db: "uptime_db", - }, - ], -}); -print("User uptime_user created successfully"); diff --git a/docker/dist/mongo/init/init_replica_set.js b/docker/dist/mongo/init/init_replica_set.js deleted file mode 100644 index 878ce68a6..000000000 --- a/docker/dist/mongo/init/init_replica_set.js +++ /dev/null @@ -1,15 +0,0 @@ -try { - const status = rs.status(); - printjson(status); -} catch (e) { - if (e.codeName === "NotYetInitialized") { - print("Replica set not initialized. Initiating..."); - rs.initiate({ - _id: "rs0", - members: [{ _id: 0, host: "mongodb:27017" }], - }); - } else { - print("Unexpected error during rs.status():"); - printjson(e); - } -}