From 0c57b4154070476f853c3b9f72bb9bd00277aaf0 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@hebeler.club>
Date: Mon, 10 Jul 2023 13:38:19 +0200
Subject: [PATCH] remove accent sync from app
---
.gitlab-ci.yml | 21 ---------------------
build/pass/Dockerfile | 2 +-
pass/accent.json | 12 ------------
pass/bin/cron | 23 -----------------------
pass/config/default.json | 13 -------------
pass/nodemon.json | 3 +--
6 files changed, 2 insertions(+), 72 deletions(-)
delete mode 100644 pass/accent.json
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eb5726f..7b62ce2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,5 @@
variables:
NODE_IMAGE: node:19-bullseye
- ACCENT_IMAGE: mirego/accent:v1.14.2
DOCKER_HOST: "tcp://docker-dind.gitlab-suma:2375"
DOCKER_BUILD_IMAGE: docker:20.10.15
DOCKER_IMAGE_NAME: keymanager
@@ -33,26 +32,6 @@ npm_deps:
only:
- main
-lang_files:
- stage: build
- image: ${NODE_IMAGE}
- variables:
- npm_config_cache: ${CI_PROJECT_DIR}/pass/.npm
- cache:
- key: npm-cache
- paths:
- - pass/.npm
- artifacts:
- public: false
- paths:
- - pass/lang
- script:
- - cd pass
- - npm i -g cli-ux accent-cli
- - accent sync
- only:
- - main
-
build:
stage: build
image: ${DOCKER_BUILD_IMAGE}
diff --git a/build/pass/Dockerfile b/build/pass/Dockerfile
index 685d037..a2cce8f 100644
--- a/build/pass/Dockerfile
+++ b/build/pass/Dockerfile
@@ -8,7 +8,7 @@ RUN echo "deb http://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" > /etc
RUN apt update && apt install -y borgbackup postgresql-client-15 && rm -rf /var/lib/apt/lists/*
ENV DEBIAN_FRONTEND=
-RUN npm i -g cli-ux accent-cli knex nodemon
+RUN npm i -g cli-ux knex nodemon
RUN mkdir /data && chown 1000:1000 /data
VOLUME ["/data"]
diff --git a/pass/accent.json b/pass/accent.json
deleted file mode 100644
index f564a79..0000000
--- a/pass/accent.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "apiUrl": "https://translate.metager.de",
- "files": [
- {
- "language": "de",
- "format": "json",
- "source": "lang/de/*.json",
- "target": "lang/%slug%/%original_file_name%.json",
- "hooks": {}
- }
- ]
-}
diff --git a/pass/bin/cron b/pass/bin/cron
index be05d09..3c408e2 100644
--- a/pass/bin/cron
+++ b/pass/bin/cron
@@ -25,35 +25,12 @@ let cronjobs = async () => {
"YYYY-MM-DD HH:mm:ss"
)}] Written ${written_logs} key changes.`
);
- //await accentSync();
console.log(`[${now.format("YYYY-MM-DD HH:mm:ss")}] Finish`);
};
console.log("Start");
let interval = setInterval(cronjobs, 60000);
cronjobs();
-async function accentSync() {
- if (process.env.NODE_ENV !== "development") {
- return;
- }
- return new Promise((resolve) => {
- exec("accent sync", (error, stdout, stderr) => {
- if (error) {
- console.error(error);
- }
- if (stderr) {
- console.error(stderr);
- }
- console.log(stdout);
- let now = dayjs();
- console.log(
- `[${now.format("YYYY-MM-DD HH:mm:ss")}] Synced language files.`
- );
- resolve();
- });
- });
-}
-
async function writeLogsToOrder() {
let redis_lock_key = "cron:writeLogsToOrder";
let interval_seconds = 60; // Will execute every minute
diff --git a/pass/config/default.json b/pass/config/default.json
index 8b8fd2e..7391c1b 100644
--- a/pass/config/default.json
+++ b/pass/config/default.json
@@ -29,19 +29,6 @@
"url": "<ZAMMAD_URL>",
"api_key": "<ZAMMAD_API_KEY>",
"notification_ticket_id": "0"
- },
- "accent": {
- "apiUrl": "https://translate.metager.de",
- "apiKey": "",
- "files": [
- {
- "language": "de",
- "format": "json",
- "source": "lang/de/*.json",
- "target": "lang/%slug%/%original_file_name%.json",
- "hooks": {}
- }
- ]
}
},
"price": {
diff --git a/pass/nodemon.json b/pass/nodemon.json
index 5813b50..b84940d 100644
--- a/pass/nodemon.json
+++ b/pass/nodemon.json
@@ -4,7 +4,6 @@
"node_modules",
".git",
"package.json",
- "package-lock.json",
- "accent.json"
+ "package-lock.json"
]
}
\ No newline at end of file
--
GitLab