diff --git a/.github/workflows/restart-services.yml b/.github/workflows/restart-services.yml index b6b7f1e..0e0f8b9 100644 --- a/.github/workflows/restart-services.yml +++ b/.github/workflows/restart-services.yml @@ -12,7 +12,7 @@ jobs: with: command: >- become sdzerobot bash -c ' - cd /data/project/sdzerobot/www/js && npm restart; + cd /data/project/sdzerobot/SDZeroBot/webservice && npm restart; cd /data/project/sdzerobot/SDZeroBot/eventstream-router && npm restart; ' host: login.toolforge.org diff --git a/most-gans/web-endpoint.ts b/most-gans/web-endpoint.ts index a3ce765..9d3f6a2 100644 --- a/most-gans/web-endpoint.ts +++ b/most-gans/web-endpoint.ts @@ -2,7 +2,7 @@ import * as express from "express"; import 'express-async-errors'; import {toolsdb} from '../db'; import {AuthManager, bot} from "../botbase"; -import {TABLE} from '../../SDZeroBot/most-gans/model'; +import {TABLE} from './model'; const router = express.Router(); diff --git a/webservice/routes/articlesearch.ts b/webservice/routes/articlesearch.ts index 37b7bf7..6db7d55 100644 --- a/webservice/routes/articlesearch.ts +++ b/webservice/routes/articlesearch.ts @@ -1,7 +1,7 @@ import * as express from "express"; import 'express-async-errors'; import {JSDOM} from 'jsdom'; -import {bot, TextExtractor} from '../../../SDZeroBot/botbase'; +import {bot, TextExtractor} from '../../botbase'; import {numericArg} from "../utils"; const router = express.Router(); diff --git a/webservice/routes/logs.ts b/webservice/routes/logs.ts index 67752cd..d389873 100644 --- a/webservice/routes/logs.ts +++ b/webservice/routes/logs.ts @@ -1,6 +1,6 @@ import * as express from "express"; import {exec} from "child_process"; -import {mapPath} from "../../../SDZeroBot/utils"; +import {mapPath} from "../../utils"; import {numericArg} from "../utils"; const router = express.Router(); diff --git a/webservice/routes/summary.ts b/webservice/routes/summary.ts index 69a555a..0f30d5c 100644 --- a/webservice/routes/summary.ts +++ b/webservice/routes/summary.ts @@ -1,6 +1,6 @@ import * as express from "express"; import 'express-async-errors'; -import {bot, TextExtractor} from '../../../SDZeroBot/botbase'; +import {bot, TextExtractor} from '../../botbase'; const router = express.Router(); diff --git a/webservice/tunnels.ts b/webservice/tunnels.ts index f206074..be0fb9a 100644 --- a/webservice/tunnels.ts +++ b/webservice/tunnels.ts @@ -1,6 +1,6 @@ -import {closeTunnels, createLocalSSHTunnel} from "../../SDZeroBot/utils"; -import {ENWIKI_DB_HOST, TOOLS_DB_HOST} from "../../SDZeroBot/db"; -import {REDIS_HOST} from "../../SDZeroBot/redis"; +import {closeTunnels, createLocalSSHTunnel} from "../utils"; +import {ENWIKI_DB_HOST, TOOLS_DB_HOST} from "../db"; +import {REDIS_HOST} from "../redis"; createLocalSSHTunnel(ENWIKI_DB_HOST); createLocalSSHTunnel(TOOLS_DB_HOST);