feat: add SKEBBY_USER and SKEBBY_PASS environment variables for Skebby integration
This commit is contained in:
parent
1ad3197d58
commit
b6d9842bcd
6 changed files with 26 additions and 1 deletions
2
apps/infoalloggi/.github/workflows/ci.yml
vendored
2
apps/infoalloggi/.github/workflows/ci.yml
vendored
|
|
@ -26,6 +26,8 @@ env:
|
||||||
KEYDB_URL: "keydb://string"
|
KEYDB_URL: "keydb://string"
|
||||||
JWT_SECRET: "335922ae"
|
JWT_SECRET: "335922ae"
|
||||||
SKIP_REDIS: "false"
|
SKIP_REDIS: "false"
|
||||||
|
SKEBBY_USER: "test"
|
||||||
|
SKEBBY_PASS : "test"
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
|
||||||
|
|
@ -68,6 +68,11 @@ ENV TILES_URL=$TILES_URL
|
||||||
ENV NEXT_TELEMETRY_DISABLED=1
|
ENV NEXT_TELEMETRY_DISABLED=1
|
||||||
ENV SKIP_REDIS="true"
|
ENV SKIP_REDIS="true"
|
||||||
|
|
||||||
|
ARG SKEBBY_USER
|
||||||
|
ENV SKEBBY_USER=$SKEBBY_USER
|
||||||
|
ARG SKEBBY_PASS
|
||||||
|
ENV SKEBBY_PASS=$SKEBBY_PASS
|
||||||
|
|
||||||
RUN SKIP_ENV_VALIDATION=1 npm run build
|
RUN SKIP_ENV_VALIDATION=1 npm run build
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -125,6 +130,11 @@ ENV TILES_URL=$TILES_URL
|
||||||
ENV NEXT_TELEMETRY_DISABLED=1
|
ENV NEXT_TELEMETRY_DISABLED=1
|
||||||
ENV SKIP_REDIS="false"
|
ENV SKIP_REDIS="false"
|
||||||
|
|
||||||
|
ARG SKEBBY_USER
|
||||||
|
ENV SKEBBY_USER=$SKEBBY_USER
|
||||||
|
ARG SKEBBY_PASS
|
||||||
|
ENV SKEBBY_PASS=$SKEBBY_PASS
|
||||||
|
|
||||||
RUN addgroup -g 1001 -S nodejs
|
RUN addgroup -g 1001 -S nodejs
|
||||||
RUN adduser -S nextjs -u 1001
|
RUN adduser -S nextjs -u 1001
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,8 @@ services:
|
||||||
EXP_API_USER: ${EXP_API_USER}
|
EXP_API_USER: ${EXP_API_USER}
|
||||||
EXP_API_PASS: ${EXP_API_PASS}
|
EXP_API_PASS: ${EXP_API_PASS}
|
||||||
JWT_SECRET: ${JWT_SECRET}
|
JWT_SECRET: ${JWT_SECRET}
|
||||||
|
SKEBBY_USER: ${SKEBBY_USER}
|
||||||
|
SKEBBY_PASS: ${SKEBBY_PASS}
|
||||||
working_dir: /app
|
working_dir: /app
|
||||||
environment:
|
environment:
|
||||||
INTERNAL_BASE_URL: ${INTERNAL_BASE_URL}
|
INTERNAL_BASE_URL: ${INTERNAL_BASE_URL}
|
||||||
|
|
@ -50,6 +52,8 @@ services:
|
||||||
EXP_API_USER: ${EXP_API_USER}
|
EXP_API_USER: ${EXP_API_USER}
|
||||||
EXP_API_PASS: ${EXP_API_PASS}
|
EXP_API_PASS: ${EXP_API_PASS}
|
||||||
JWT_SECRET: ${JWT_SECRET}
|
JWT_SECRET: ${JWT_SECRET}
|
||||||
|
SKEBBY_USER: ${SKEBBY_USER}
|
||||||
|
SKEBBY_PASS: ${SKEBBY_PASS}
|
||||||
ports:
|
ports:
|
||||||
- "3000:3000"
|
- "3000:3000"
|
||||||
networks:
|
networks:
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,8 @@ const server = z.object({
|
||||||
STRIPE_SECRET_KEY: z.string(),
|
STRIPE_SECRET_KEY: z.string(),
|
||||||
STRIPE_WEBHOOK_SECRET: z.string(),
|
STRIPE_WEBHOOK_SECRET: z.string(),
|
||||||
TILES_URL: z.string(),
|
TILES_URL: z.string(),
|
||||||
|
SKEBBY_USER: z.string(),
|
||||||
|
SKEBBY_PASS: z.string(),
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -69,6 +71,8 @@ const processEnv = {
|
||||||
STRIPE_SECRET_KEY: process.env.STRIPE_SECRET_KEY,
|
STRIPE_SECRET_KEY: process.env.STRIPE_SECRET_KEY,
|
||||||
STRIPE_WEBHOOK_SECRET: process.env.STRIPE_WEBHOOK_SECRET,
|
STRIPE_WEBHOOK_SECRET: process.env.STRIPE_WEBHOOK_SECRET,
|
||||||
TILES_URL: process.env.TILES_URL,
|
TILES_URL: process.env.TILES_URL,
|
||||||
|
SKEBBY_USER: process.env.SKEBBY_USER,
|
||||||
|
SKEBBY_PASS: process.env.SKEBBY_PASS,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Don't touch the part below
|
// Don't touch the part below
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
import { env } from "~/env.mjs";
|
||||||
import { GetFlagValueHandler } from "~/server/controllers/flags.controller";
|
import { GetFlagValueHandler } from "~/server/controllers/flags.controller";
|
||||||
import { db } from "~/server/db";
|
import { db } from "~/server/db";
|
||||||
import { NewMail } from "~/server/services/mailer";
|
import { NewMail } from "~/server/services/mailer";
|
||||||
|
|
@ -144,7 +145,7 @@ export const SendMessage = async (data: MinimalSMSData) => {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
const auth = await login("arcasms2018", "123qwe456rtyA.");
|
const auth = await login(env.SKEBBY_USER, env.SKEBBY_PASS);
|
||||||
await sendSMS(auth, {
|
await sendSMS(auth, {
|
||||||
...data,
|
...data,
|
||||||
message_type: MessageType.HIGH_QUALITY,
|
message_type: MessageType.HIGH_QUALITY,
|
||||||
|
|
|
||||||
|
|
@ -148,6 +148,8 @@ services:
|
||||||
EXP_API_USER: ${EXP_API_USER}
|
EXP_API_USER: ${EXP_API_USER}
|
||||||
EXP_API_PASS: ${EXP_API_PASS}
|
EXP_API_PASS: ${EXP_API_PASS}
|
||||||
JWT_SECRET: ${JWT_SECRET}
|
JWT_SECRET: ${JWT_SECRET}
|
||||||
|
SKEBBY_USER: ${SKEBBY_USER}
|
||||||
|
SKEBBY_PASS: ${SKEBBY_PASS}
|
||||||
working_dir: /app
|
working_dir: /app
|
||||||
environment:
|
environment:
|
||||||
INTERNAL_BASE_URL: http://web:3000
|
INTERNAL_BASE_URL: http://web:3000
|
||||||
|
|
@ -172,6 +174,8 @@ services:
|
||||||
EXP_API_USER: ${EXP_API_USER}
|
EXP_API_USER: ${EXP_API_USER}
|
||||||
EXP_API_PASS: ${EXP_API_PASS}
|
EXP_API_PASS: ${EXP_API_PASS}
|
||||||
JWT_SECRET: ${JWT_SECRET}
|
JWT_SECRET: ${JWT_SECRET}
|
||||||
|
SKEBBY_USER: ${SKEBBY_USER}
|
||||||
|
SKEBBY_PASS: ${SKEBBY_PASS}
|
||||||
networks:
|
networks:
|
||||||
- dokploy-network
|
- dokploy-network
|
||||||
ports:
|
ports:
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue