remove systemd, follow branches, clone vaindock

8 files changed, 20 insertions, 65 deletions

diff --git a/.gitmodules b/.gitmodules
index 79ca5eb..a5af2d0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,24 @@
 [submodule "apigrabber"]
 	path = apigrabber
 	url = https://github.com/vainglorygame/apigrabber
+	branch = releases/1.0.0
 [submodule "processor"]
 	path = processor
 	url = https://github.com/vainglorygame/processor
+	branch = releases/1.0.0
 [submodule "statscompiler"]
 	path = statscompiler
 	url = https://github.com/vainglorygame/statscompiler
+	branch = releases/1.0.0
 [submodule "discordbot"]
 	path = discordbot
 	url = https://github.com/vainglorygame/discordbot
+	branch = releases/1.0.0
 [submodule "preloader"]
 	path = preloader
 	url = https://github.com/vainglorygame/preloader
+	branch = releases/1.0.0
+[submodule "vaindock"]
+	path = vaindock
+	url = https://github.com/vainglorygame/vaindock
+	branch = develop
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..028c50f
--- /dev/null
+++ b/README.md
@@ -0,0 +1,11 @@
+Setup
+===
+
+`git clone --recursive https://github.com/vainglorygame/meta`
+
+Enter `vaindock/` and [follow the instructions there](vaindock/Readme.md).
+
+Updating
+===
+
+`git submodule update --recursive --remote`
diff --git a/supervisord.conf b/supervisord.conf.example
index c770de2..c770de2 100644
--- a/supervisord.conf
+++ b/supervisord.conf.example
diff --git a/systemd/config.env b/systemd/config.env
deleted file mode 100644
index d52d740..0000000
--- a/systemd/config.env
+++ /dev/null
@@ -1,26 +0,0 @@
-# apigrabber
-POSTGRESQL_HOST=
-POSTGRESQL_PORT=5433
-POSTGRESQL_DB=vain_raw
-POSTGRESQL_USER=vainraw
-POSTGRESQL_PASSWORD=
-
-# processor, compiler
-# raw
-POSTGRESQL_SOURCE_HOST=
-POSTGRESQL_SOURCE_PORT=5433
-POSTGRESQL_SOURCE_DB=vain_raw
-POSTGRESQL_SOURCE_USER=vainraw
-POSTGRESQL_SOURCE_PASSWORD=
-
-# web
-POSTGRESQL_DEST_HOST=
-POSTGRESQL_DEST_PORT=5433
-POSTGRESQL_DEST_DB=vain_web
-POSTGRESQL_DEST_USER=vainweb
-POSTGRESQL_DEST_PASSWORD=
-
-VAINSOCIAL_APITOKEN=
-
-VAINSOCIAL_SPIDER=true
-VAINSOCIAL_ANALYZE=false
diff --git a/systemd/vainsocial-apigrabber.service b/systemd/vainsocial-apigrabber.service
deleted file mode 100644
index 10205f6..0000000
--- a/systemd/vainsocial-apigrabber.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Vainsocial API grabber service
-After=network.target
-
-[Service]
-Type=simple
-User=vainsocial
-ExecStart=/vainsocial/apigrabber/venv/bin/python /vainsocial/apigrabber/api.py
-Restart=on-failure
-EnvironmentFile=/vainsocial/systemd/config.env
-
-[Install]
-WantedBy=multi-user.target
diff --git a/systemd/vainsocial-compiler.service b/systemd/vainsocial-compiler.service
deleted file mode 100644
index dc90979..0000000
--- a/systemd/vainsocial-compiler.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Vainsocial compiler service
-After=network.target
-
-[Service]
-Type=simple
-User=vainsocial
-ExecStart=/vainsocial/statscompiler/venv/bin/python /vainsocial/statscompiler/api.py
-Restart=on-failure
-EnvironmentFile=/vainsocial/systemd/config.env
-
-[Install]
-WantedBy=multi-user.target
diff --git a/systemd/vainsocial-processor.service b/systemd/vainsocial-processor.service
deleted file mode 100644
index c7a7cf0..0000000
--- a/systemd/vainsocial-processor.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Vainsocial processor service
-After=network.target
-
-[Service]
-Type=simple
-User=vainsocial
-ExecStart=/vainsocial/processor/venv/bin/python /vainsocial/processor/api.py
-Restart=on-failure
-EnvironmentFile=/vainsocial/systemd/config.env
-
-[Install]
-WantedBy=multi-user.target
diff --git a/vaindock b/vaindock
new file mode 160000
+Subproject 5ce83a22303a759ae3b26b1f901fbb9bad232f8