aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/build/docker-compose.yml7
-rw-r--r--app/build/mariadb/60-remote.cnf2
-rw-r--r--app/config/configuration/seafile/conf/gunicorn.conf16
-rw-r--r--app/deployment/mariadb.hcl2
-rw-r--r--app/deployment/seafile.hcl33
5 files changed, 38 insertions, 22 deletions
diff --git a/app/build/docker-compose.yml b/app/build/docker-compose.yml
index ee76372..2a67453 100644
--- a/app/build/docker-compose.yml
+++ b/app/build/docker-compose.yml
@@ -1,6 +1,13 @@
version: '3.4'
services:
+ mariadb:
+ build:
+ context: ./mariadb
+ args:
+ VERSION: 4 # fake for now
+ image: superboum/amd64_mariadb:v4
+
# Instant Messaging
riot:
build:
diff --git a/app/build/mariadb/60-remote.cnf b/app/build/mariadb/60-remote.cnf
index f759a49..acf8f9b 100644
--- a/app/build/mariadb/60-remote.cnf
+++ b/app/build/mariadb/60-remote.cnf
@@ -1,2 +1,2 @@
[mysqld]
-bind-address = 0.0.0.0
+bind-address = *
diff --git a/app/config/configuration/seafile/conf/gunicorn.conf b/app/config/configuration/seafile/conf/gunicorn.conf
new file mode 100644
index 0000000..415fd32
--- /dev/null
+++ b/app/config/configuration/seafile/conf/gunicorn.conf
@@ -0,0 +1,16 @@
+import os
+
+daemon = True
+workers = 5
+
+# default localhost:8000
+bind = "[::]:8000"
+
+# Pid
+pids_dir = '/srv/webstore/pids'
+pidfile = os.path.join(pids_dir, 'seahub.pid')
+
+# for file upload, we need a longer timeout value (default is only 30s, too short)
+timeout = 1200
+
+limit_request_line = 8190
diff --git a/app/deployment/mariadb.hcl b/app/deployment/mariadb.hcl
index 29e2be6..da24273 100644
--- a/app/deployment/mariadb.hcl
+++ b/app/deployment/mariadb.hcl
@@ -12,7 +12,7 @@ job "mariadb" {
task "server" {
driver = "docker"
config {
- image = "superboum/amd64_mariadb:v3"
+ image = "superboum/amd64_mariadb:v4"
network_mode = "host"
command = "tail"
args = [
diff --git a/app/deployment/seafile.hcl b/app/deployment/seafile.hcl
index e22699c..3a23be0 100644
--- a/app/deployment/seafile.hcl
+++ b/app/deployment/seafile.hcl
@@ -13,17 +13,12 @@ job "seafile" {
driver = "docker"
config {
image = "superboum/amd64_seafile:v6"
+ network_mode = "host"
## cmd + args are used for running an instance attachable for update
# command = "/bin/sleep"
# args = ["999999"]
- port_map {
- seahub_port = 8000
- seafdav_port = 8084
- seafhttp_port = 8082
- }
-
mounts = [
{
type = "bind"
@@ -40,11 +35,6 @@ job "seafile" {
resources {
memory = 512
- network {
- port "seahub_port" {}
- port "seafhttp_port" {}
- port "seafdav_port" {}
- }
}
service {
@@ -54,12 +44,13 @@ job "seafile" {
"traefik.frontend.entryPoints=https,http",
"traefik.frontend.rule=Host:cloud.deuxfleurs.fr;PathPrefix:/"
]
- port = "seahub_port"
- address_mode = "host"
+ port = 8000
+ address_mode = "driver"
name = "seahub"
check {
type = "tcp"
- port = "seahub_port"
+ port = 8000
+ address_mode = "driver"
interval = "60s"
timeout = "5s"
check_restart {
@@ -78,12 +69,13 @@ job "seafile" {
"traefik.frontend.rule=Host:cloud.deuxfleurs.fr;PathPrefixStrip:/seafhttp"
]
- port = "seafhttp_port"
- address_mode = "host"
+ port = 8082
+ address_mode = "driver"
name = "seafhttp"
check {
type = "tcp"
- port = "seafhttp_port"
+ port = 8082
+ address_mode = "driver"
interval = "60s"
timeout = "5s"
check_restart {
@@ -102,12 +94,13 @@ job "seafile" {
"traefik.frontend.rule=Host:cloud.deuxfleurs.fr;PathPrefix:/seafdav"
]
- port = "seafdav_port"
- address_mode = "host"
+ port = 8084
+ address_mode = "driver"
name = "seafdav"
check {
type = "tcp"
- port = "seafdav_port"
+ port = 8084
+ address_mode = "driver"
interval = "60s"
timeout = "5s"
check_restart {