From 122fdca5db4abfdca77f6d6a90a910e34ff34831 Mon Sep 17 00:00:00 2001 From: Mark Veidemanis Date: Tue, 6 Sep 2022 12:50:09 +0100 Subject: [PATCH] Moved files to subdirectory --- .env.example => legacy/.env.example | 0 .gitignore => legacy/.gitignore | 0 .../.pre-commit-config.yaml | 0 {api => legacy/api}/views.py | 0 {commands => legacy/commands}/__init__.py | 0 {commands => legacy/commands}/admall.py | 0 {commands => legacy/commands}/alias.py | 0 {commands => legacy/commands}/all.py | 0 {commands => legacy/commands}/allc.py | 0 {commands => legacy/commands}/authcheck.py | 0 {commands => legacy/commands}/auto.py | 0 {commands => legacy/commands}/blacklist.py | 0 {commands => legacy/commands}/chans.py | 0 {commands => legacy/commands}/cmd.py | 0 {commands => legacy/commands}/confirm.py | 0 {commands => legacy/commands}/dedup.py | 0 {commands => legacy/commands}/disable.py | 0 {commands => legacy/commands}/dist.py | 0 {commands => legacy/commands}/email.py | 0 {commands => legacy/commands}/enable.py | 0 {commands => legacy/commands}/exec.py | 0 {commands => legacy/commands}/getstr.py | 0 {commands => legacy/commands}/help.py | 0 {commands => legacy/commands}/join.py | 0 {commands => legacy/commands}/list.py | 0 {commands => legacy/commands}/load.py | 0 {commands => legacy/commands}/loadmod.py | 0 {commands => legacy/commands}/logout.py | 0 {commands => legacy/commands}/mod.py | 0 {commands => legacy/commands}/msg.py | 0 {commands => legacy/commands}/network.py | 0 {commands => legacy/commands}/part.py | 0 {commands => legacy/commands}/pass.py | 0 {commands => legacy/commands}/pending.py | 0 {commands => legacy/commands}/recheckauth.py | 0 {commands => legacy/commands}/reg.py | 0 {commands => legacy/commands}/relay.py | 0 {commands => legacy/commands}/save.py | 0 {commands => legacy/commands}/stats.py | 0 {commands => legacy/commands}/swho.py | 0 {commands => legacy/commands}/token.py | 0 {commands => legacy/commands}/users.py | 0 {commands => legacy/commands}/who.py | 0 {conf => legacy/conf}/templates/aliasdata.json | 0 {conf => legacy/conf}/templates/config.json | 0 {conf => legacy/conf}/templates/help.json | 0 {conf => legacy/conf}/templates/irc.json | 0 {core => legacy/core}/bot.py | 0 {core => legacy/core}/logstash.py | 0 {core => legacy/core}/parser.py | 0 {core => legacy/core}/relay.py | 0 {core => legacy/core}/server.py | 0 docker-compose.yml => legacy/docker-compose.yml | 0 {docker => legacy/docker}/Dockerfile | 0 .../docker}/docker-compose.prod.yml | 0 {docker => legacy/docker}/redis.conf | 0 {docker => legacy/docker}/requirements.prod.txt | 0 main.py => legacy/main.py | 0 {modules => legacy/modules}/__init__.py | 0 {modules => legacy/modules}/alias.py | 0 {modules => legacy/modules}/chankeep.py | 0 {modules => legacy/modules}/counters.py | 0 {modules => legacy/modules}/helpers.py | 0 {modules => legacy/modules}/monitor.py | 0 {modules => legacy/modules}/network.py | 0 {modules => legacy/modules}/provision.py | 0 {modules => legacy/modules}/regproc.py | 0 {modules => legacy/modules}/userinfo.py | 0 requirements.txt => legacy/requirements.txt | 0 runtest.sh => legacy/runtest.sh | 0 legacy/stack.env | 17 +++++++++++++++++ {tests => legacy/tests}/test_chankeep.py | 0 threshold => legacy/threshold | 0 {utils => legacy/utils}/cleanup.py | 0 {utils => legacy/utils}/dedup.py | 0 .../utils}/deliver_relay_commands.py | 0 {utils => legacy/utils}/get.py | 0 .../utils}/loaders/command_loader.py | 0 .../utils}/loaders/single_loader.py | 0 {utils => legacy/utils}/logging/debug.py | 0 {utils => legacy/utils}/logging/log.py | 0 {utils => legacy/utils}/logging/send.py | 0 {utils => legacy/utils}/parsing.py | 0 83 files changed, 17 insertions(+) rename .env.example => legacy/.env.example (100%) rename .gitignore => legacy/.gitignore (100%) rename .pre-commit-config.yaml => legacy/.pre-commit-config.yaml (100%) rename {api => legacy/api}/views.py (100%) rename {commands => legacy/commands}/__init__.py (100%) rename {commands => legacy/commands}/admall.py (100%) rename {commands => legacy/commands}/alias.py (100%) rename {commands => legacy/commands}/all.py (100%) rename {commands => legacy/commands}/allc.py (100%) rename {commands => legacy/commands}/authcheck.py (100%) rename {commands => legacy/commands}/auto.py (100%) rename {commands => legacy/commands}/blacklist.py (100%) rename {commands => legacy/commands}/chans.py (100%) rename {commands => legacy/commands}/cmd.py (100%) rename {commands => legacy/commands}/confirm.py (100%) rename {commands => legacy/commands}/dedup.py (100%) rename {commands => legacy/commands}/disable.py (100%) rename {commands => legacy/commands}/dist.py (100%) rename {commands => legacy/commands}/email.py (100%) rename {commands => legacy/commands}/enable.py (100%) rename {commands => legacy/commands}/exec.py (100%) rename {commands => legacy/commands}/getstr.py (100%) rename {commands => legacy/commands}/help.py (100%) rename {commands => legacy/commands}/join.py (100%) rename {commands => legacy/commands}/list.py (100%) rename {commands => legacy/commands}/load.py (100%) rename {commands => legacy/commands}/loadmod.py (100%) rename {commands => legacy/commands}/logout.py (100%) rename {commands => legacy/commands}/mod.py (100%) rename {commands => legacy/commands}/msg.py (100%) rename {commands => legacy/commands}/network.py (100%) rename {commands => legacy/commands}/part.py (100%) rename {commands => legacy/commands}/pass.py (100%) rename {commands => legacy/commands}/pending.py (100%) rename {commands => legacy/commands}/recheckauth.py (100%) rename {commands => legacy/commands}/reg.py (100%) rename {commands => legacy/commands}/relay.py (100%) rename {commands => legacy/commands}/save.py (100%) rename {commands => legacy/commands}/stats.py (100%) rename {commands => legacy/commands}/swho.py (100%) rename {commands => legacy/commands}/token.py (100%) rename {commands => legacy/commands}/users.py (100%) rename {commands => legacy/commands}/who.py (100%) rename {conf => legacy/conf}/templates/aliasdata.json (100%) rename {conf => legacy/conf}/templates/config.json (100%) rename {conf => legacy/conf}/templates/help.json (100%) rename {conf => legacy/conf}/templates/irc.json (100%) rename {core => legacy/core}/bot.py (100%) rename {core => legacy/core}/logstash.py (100%) rename {core => legacy/core}/parser.py (100%) rename {core => legacy/core}/relay.py (100%) rename {core => legacy/core}/server.py (100%) rename docker-compose.yml => legacy/docker-compose.yml (100%) rename {docker => legacy/docker}/Dockerfile (100%) rename {docker => legacy/docker}/docker-compose.prod.yml (100%) rename {docker => legacy/docker}/redis.conf (100%) rename {docker => legacy/docker}/requirements.prod.txt (100%) rename main.py => legacy/main.py (100%) rename {modules => legacy/modules}/__init__.py (100%) rename {modules => legacy/modules}/alias.py (100%) rename {modules => legacy/modules}/chankeep.py (100%) rename {modules => legacy/modules}/counters.py (100%) rename {modules => legacy/modules}/helpers.py (100%) rename {modules => legacy/modules}/monitor.py (100%) rename {modules => legacy/modules}/network.py (100%) rename {modules => legacy/modules}/provision.py (100%) rename {modules => legacy/modules}/regproc.py (100%) rename {modules => legacy/modules}/userinfo.py (100%) rename requirements.txt => legacy/requirements.txt (100%) rename runtest.sh => legacy/runtest.sh (100%) create mode 100644 legacy/stack.env rename {tests => legacy/tests}/test_chankeep.py (100%) rename threshold => legacy/threshold (100%) rename {utils => legacy/utils}/cleanup.py (100%) rename {utils => legacy/utils}/dedup.py (100%) rename {utils => legacy/utils}/deliver_relay_commands.py (100%) rename {utils => legacy/utils}/get.py (100%) rename {utils => legacy/utils}/loaders/command_loader.py (100%) rename {utils => legacy/utils}/loaders/single_loader.py (100%) rename {utils => legacy/utils}/logging/debug.py (100%) rename {utils => legacy/utils}/logging/log.py (100%) rename {utils => legacy/utils}/logging/send.py (100%) rename {utils => legacy/utils}/parsing.py (100%) diff --git a/.env.example b/legacy/.env.example similarity index 100% rename from .env.example rename to legacy/.env.example diff --git a/.gitignore b/legacy/.gitignore similarity index 100% rename from .gitignore rename to legacy/.gitignore diff --git a/.pre-commit-config.yaml b/legacy/.pre-commit-config.yaml similarity index 100% rename from .pre-commit-config.yaml rename to legacy/.pre-commit-config.yaml diff --git a/api/views.py b/legacy/api/views.py similarity index 100% rename from api/views.py rename to legacy/api/views.py diff --git a/commands/__init__.py b/legacy/commands/__init__.py similarity index 100% rename from commands/__init__.py rename to legacy/commands/__init__.py diff --git a/commands/admall.py b/legacy/commands/admall.py similarity index 100% rename from commands/admall.py rename to legacy/commands/admall.py diff --git a/commands/alias.py b/legacy/commands/alias.py similarity index 100% rename from commands/alias.py rename to legacy/commands/alias.py diff --git a/commands/all.py b/legacy/commands/all.py similarity index 100% rename from commands/all.py rename to legacy/commands/all.py diff --git a/commands/allc.py b/legacy/commands/allc.py similarity index 100% rename from commands/allc.py rename to legacy/commands/allc.py diff --git a/commands/authcheck.py b/legacy/commands/authcheck.py similarity index 100% rename from commands/authcheck.py rename to legacy/commands/authcheck.py diff --git a/commands/auto.py b/legacy/commands/auto.py similarity index 100% rename from commands/auto.py rename to legacy/commands/auto.py diff --git a/commands/blacklist.py b/legacy/commands/blacklist.py similarity index 100% rename from commands/blacklist.py rename to legacy/commands/blacklist.py diff --git a/commands/chans.py b/legacy/commands/chans.py similarity index 100% rename from commands/chans.py rename to legacy/commands/chans.py diff --git a/commands/cmd.py b/legacy/commands/cmd.py similarity index 100% rename from commands/cmd.py rename to legacy/commands/cmd.py diff --git a/commands/confirm.py b/legacy/commands/confirm.py similarity index 100% rename from commands/confirm.py rename to legacy/commands/confirm.py diff --git a/commands/dedup.py b/legacy/commands/dedup.py similarity index 100% rename from commands/dedup.py rename to legacy/commands/dedup.py diff --git a/commands/disable.py b/legacy/commands/disable.py similarity index 100% rename from commands/disable.py rename to legacy/commands/disable.py diff --git a/commands/dist.py b/legacy/commands/dist.py similarity index 100% rename from commands/dist.py rename to legacy/commands/dist.py diff --git a/commands/email.py b/legacy/commands/email.py similarity index 100% rename from commands/email.py rename to legacy/commands/email.py diff --git a/commands/enable.py b/legacy/commands/enable.py similarity index 100% rename from commands/enable.py rename to legacy/commands/enable.py diff --git a/commands/exec.py b/legacy/commands/exec.py similarity index 100% rename from commands/exec.py rename to legacy/commands/exec.py diff --git a/commands/getstr.py b/legacy/commands/getstr.py similarity index 100% rename from commands/getstr.py rename to legacy/commands/getstr.py diff --git a/commands/help.py b/legacy/commands/help.py similarity index 100% rename from commands/help.py rename to legacy/commands/help.py diff --git a/commands/join.py b/legacy/commands/join.py similarity index 100% rename from commands/join.py rename to legacy/commands/join.py diff --git a/commands/list.py b/legacy/commands/list.py similarity index 100% rename from commands/list.py rename to legacy/commands/list.py diff --git a/commands/load.py b/legacy/commands/load.py similarity index 100% rename from commands/load.py rename to legacy/commands/load.py diff --git a/commands/loadmod.py b/legacy/commands/loadmod.py similarity index 100% rename from commands/loadmod.py rename to legacy/commands/loadmod.py diff --git a/commands/logout.py b/legacy/commands/logout.py similarity index 100% rename from commands/logout.py rename to legacy/commands/logout.py diff --git a/commands/mod.py b/legacy/commands/mod.py similarity index 100% rename from commands/mod.py rename to legacy/commands/mod.py diff --git a/commands/msg.py b/legacy/commands/msg.py similarity index 100% rename from commands/msg.py rename to legacy/commands/msg.py diff --git a/commands/network.py b/legacy/commands/network.py similarity index 100% rename from commands/network.py rename to legacy/commands/network.py diff --git a/commands/part.py b/legacy/commands/part.py similarity index 100% rename from commands/part.py rename to legacy/commands/part.py diff --git a/commands/pass.py b/legacy/commands/pass.py similarity index 100% rename from commands/pass.py rename to legacy/commands/pass.py diff --git a/commands/pending.py b/legacy/commands/pending.py similarity index 100% rename from commands/pending.py rename to legacy/commands/pending.py diff --git a/commands/recheckauth.py b/legacy/commands/recheckauth.py similarity index 100% rename from commands/recheckauth.py rename to legacy/commands/recheckauth.py diff --git a/commands/reg.py b/legacy/commands/reg.py similarity index 100% rename from commands/reg.py rename to legacy/commands/reg.py diff --git a/commands/relay.py b/legacy/commands/relay.py similarity index 100% rename from commands/relay.py rename to legacy/commands/relay.py diff --git a/commands/save.py b/legacy/commands/save.py similarity index 100% rename from commands/save.py rename to legacy/commands/save.py diff --git a/commands/stats.py b/legacy/commands/stats.py similarity index 100% rename from commands/stats.py rename to legacy/commands/stats.py diff --git a/commands/swho.py b/legacy/commands/swho.py similarity index 100% rename from commands/swho.py rename to legacy/commands/swho.py diff --git a/commands/token.py b/legacy/commands/token.py similarity index 100% rename from commands/token.py rename to legacy/commands/token.py diff --git a/commands/users.py b/legacy/commands/users.py similarity index 100% rename from commands/users.py rename to legacy/commands/users.py diff --git a/commands/who.py b/legacy/commands/who.py similarity index 100% rename from commands/who.py rename to legacy/commands/who.py diff --git a/conf/templates/aliasdata.json b/legacy/conf/templates/aliasdata.json similarity index 100% rename from conf/templates/aliasdata.json rename to legacy/conf/templates/aliasdata.json diff --git a/conf/templates/config.json b/legacy/conf/templates/config.json similarity index 100% rename from conf/templates/config.json rename to legacy/conf/templates/config.json diff --git a/conf/templates/help.json b/legacy/conf/templates/help.json similarity index 100% rename from conf/templates/help.json rename to legacy/conf/templates/help.json diff --git a/conf/templates/irc.json b/legacy/conf/templates/irc.json similarity index 100% rename from conf/templates/irc.json rename to legacy/conf/templates/irc.json diff --git a/core/bot.py b/legacy/core/bot.py similarity index 100% rename from core/bot.py rename to legacy/core/bot.py diff --git a/core/logstash.py b/legacy/core/logstash.py similarity index 100% rename from core/logstash.py rename to legacy/core/logstash.py diff --git a/core/parser.py b/legacy/core/parser.py similarity index 100% rename from core/parser.py rename to legacy/core/parser.py diff --git a/core/relay.py b/legacy/core/relay.py similarity index 100% rename from core/relay.py rename to legacy/core/relay.py diff --git a/core/server.py b/legacy/core/server.py similarity index 100% rename from core/server.py rename to legacy/core/server.py diff --git a/docker-compose.yml b/legacy/docker-compose.yml similarity index 100% rename from docker-compose.yml rename to legacy/docker-compose.yml diff --git a/docker/Dockerfile b/legacy/docker/Dockerfile similarity index 100% rename from docker/Dockerfile rename to legacy/docker/Dockerfile diff --git a/docker/docker-compose.prod.yml b/legacy/docker/docker-compose.prod.yml similarity index 100% rename from docker/docker-compose.prod.yml rename to legacy/docker/docker-compose.prod.yml diff --git a/docker/redis.conf b/legacy/docker/redis.conf similarity index 100% rename from docker/redis.conf rename to legacy/docker/redis.conf diff --git a/docker/requirements.prod.txt b/legacy/docker/requirements.prod.txt similarity index 100% rename from docker/requirements.prod.txt rename to legacy/docker/requirements.prod.txt diff --git a/main.py b/legacy/main.py similarity index 100% rename from main.py rename to legacy/main.py diff --git a/modules/__init__.py b/legacy/modules/__init__.py similarity index 100% rename from modules/__init__.py rename to legacy/modules/__init__.py diff --git a/modules/alias.py b/legacy/modules/alias.py similarity index 100% rename from modules/alias.py rename to legacy/modules/alias.py diff --git a/modules/chankeep.py b/legacy/modules/chankeep.py similarity index 100% rename from modules/chankeep.py rename to legacy/modules/chankeep.py diff --git a/modules/counters.py b/legacy/modules/counters.py similarity index 100% rename from modules/counters.py rename to legacy/modules/counters.py diff --git a/modules/helpers.py b/legacy/modules/helpers.py similarity index 100% rename from modules/helpers.py rename to legacy/modules/helpers.py diff --git a/modules/monitor.py b/legacy/modules/monitor.py similarity index 100% rename from modules/monitor.py rename to legacy/modules/monitor.py diff --git a/modules/network.py b/legacy/modules/network.py similarity index 100% rename from modules/network.py rename to legacy/modules/network.py diff --git a/modules/provision.py b/legacy/modules/provision.py similarity index 100% rename from modules/provision.py rename to legacy/modules/provision.py diff --git a/modules/regproc.py b/legacy/modules/regproc.py similarity index 100% rename from modules/regproc.py rename to legacy/modules/regproc.py diff --git a/modules/userinfo.py b/legacy/modules/userinfo.py similarity index 100% rename from modules/userinfo.py rename to legacy/modules/userinfo.py diff --git a/requirements.txt b/legacy/requirements.txt similarity index 100% rename from requirements.txt rename to legacy/requirements.txt diff --git a/runtest.sh b/legacy/runtest.sh similarity index 100% rename from runtest.sh rename to legacy/runtest.sh diff --git a/legacy/stack.env b/legacy/stack.env new file mode 100644 index 0000000..b04bec9 --- /dev/null +++ b/legacy/stack.env @@ -0,0 +1,17 @@ +THRESHOLD_LISTENER_HOST=0.0.0.0 +THRESHOLD_LISTENER_PORT=13867 +THRESHOLD_LISTENER_SSL=1 + +THRESHOLD_RELAY_ENABLED=0 +THRESHOLD_RELAY_HOST=0.0.0.0 +THRESHOLD_RELAY_PORT=13868 +THRESHOLD_RELAY_SSL=1 + +THRESHOLD_API_ENABLED=1 +THRESHOLD_API_HOST=0.0.0.0 +THRESHOLD_API_PORT=13869 +PORTAINER_GIT_DIR=.. + +THRESHOLD_CONFIG_DIR=../conf/live/ +THRESHOLD_TEMPLATE_DIR=../conf/example/ +THRESHOLD_CERT_DIR=../conf/cert/ \ No newline at end of file diff --git a/tests/test_chankeep.py b/legacy/tests/test_chankeep.py similarity index 100% rename from tests/test_chankeep.py rename to legacy/tests/test_chankeep.py diff --git a/threshold b/legacy/threshold similarity index 100% rename from threshold rename to legacy/threshold diff --git a/utils/cleanup.py b/legacy/utils/cleanup.py similarity index 100% rename from utils/cleanup.py rename to legacy/utils/cleanup.py diff --git a/utils/dedup.py b/legacy/utils/dedup.py similarity index 100% rename from utils/dedup.py rename to legacy/utils/dedup.py diff --git a/utils/deliver_relay_commands.py b/legacy/utils/deliver_relay_commands.py similarity index 100% rename from utils/deliver_relay_commands.py rename to legacy/utils/deliver_relay_commands.py diff --git a/utils/get.py b/legacy/utils/get.py similarity index 100% rename from utils/get.py rename to legacy/utils/get.py diff --git a/utils/loaders/command_loader.py b/legacy/utils/loaders/command_loader.py similarity index 100% rename from utils/loaders/command_loader.py rename to legacy/utils/loaders/command_loader.py diff --git a/utils/loaders/single_loader.py b/legacy/utils/loaders/single_loader.py similarity index 100% rename from utils/loaders/single_loader.py rename to legacy/utils/loaders/single_loader.py diff --git a/utils/logging/debug.py b/legacy/utils/logging/debug.py similarity index 100% rename from utils/logging/debug.py rename to legacy/utils/logging/debug.py diff --git a/utils/logging/log.py b/legacy/utils/logging/log.py similarity index 100% rename from utils/logging/log.py rename to legacy/utils/logging/log.py diff --git a/utils/logging/send.py b/legacy/utils/logging/send.py similarity index 100% rename from utils/logging/send.py rename to legacy/utils/logging/send.py diff --git a/utils/parsing.py b/legacy/utils/parsing.py similarity index 100% rename from utils/parsing.py rename to legacy/utils/parsing.py