fix postgres wrong mount
This commit is contained in:
parent
d700a9fc13
commit
15174fabcd
5 changed files with 29 additions and 20 deletions
|
|
@ -30,7 +30,7 @@ services:
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=false"
|
- "traefik.enable=false"
|
||||||
volumes:
|
volumes:
|
||||||
- mariadb-data:/var/lib/mysql
|
- ./volumes/mariadb/data:/var/lib/mysql
|
||||||
networks:
|
networks:
|
||||||
- database
|
- database
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
@ -42,7 +42,7 @@ services:
|
||||||
- POSTGRES_USER=${POSTGRES_USER}
|
- POSTGRES_USER=${POSTGRES_USER}
|
||||||
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
|
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
|
||||||
volumes:
|
volumes:
|
||||||
- postgres-data:/var/lib/postgresql
|
- ./volumes/postgres/data:/var/lib/postgresql/data
|
||||||
networks:
|
networks:
|
||||||
- database
|
- database
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
@ -116,10 +116,6 @@ services:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
mariadb-data:
|
|
||||||
name: mariadb-data
|
|
||||||
postgres-data:
|
|
||||||
name: postgres-data
|
|
||||||
server-certificates:
|
server-certificates:
|
||||||
name: server-certificates
|
name: server-certificates
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Creating Hedgehog infrastructure..."
|
echo "Creating Hedgehog infrastructure..."
|
||||||
source ./hedgehog/.env
|
source ./hedgedoc/.env
|
||||||
docker exec postgres psql -U $POSTGRES_USER -d postgres -c "CREATE USER $HEDGEDOC_DB_USER WITH PASSWORD '$HEDGEDOC_DB_PASSWORD';"
|
docker exec postgres psql -U $POSTGRES_USER -d postgres -c "CREATE USER $HEDGEDOC_DB_USER WITH PASSWORD '$HEDGEDOC_DB_PASSWORD';"
|
||||||
docker exec postgres psql -U $POSTGRES_USER -d postgres -c "CREATE DATABASE $HEDGEDOC_DB_NAME OWNER $HEDGEDOC_DB_USER;"
|
docker exec postgres psql -U $POSTGRES_USER -d postgres -c "CREATE DATABASE $HEDGEDOC_DB_NAME OWNER $HEDGEDOC_DB_USER;"
|
||||||
docker exec postgres psql -U $POSTGRES_USER -d $HEDGEDOC_DB_NAME -c "GRANT ALL PRIVILEGES ON DATABASE $HEDGEDOC_DB_NAME TO $HEDGEDOC_DB_USER;"
|
docker exec postgres psql -U $POSTGRES_USER -d $HEDGEDOC_DB_NAME -c "GRANT ALL PRIVILEGES ON DATABASE $HEDGEDOC_DB_NAME TO $HEDGEDOC_DB_USER;"
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,21 @@
|
||||||
<?php
|
<?php
|
||||||
$CONFIG = array (
|
$CONFIG = array (
|
||||||
'maintenance_window_start' => 1,
|
'memcache.local' => '\\OC\\Memcache\\APCu',
|
||||||
'memcache.local' => '\OC\Memcache\APCu',
|
'memcache.distributed' => '\\OC\\Memcache\\Redis',
|
||||||
'memcache.locking' => '\OC\Memcache\Redis',
|
'memcache.locking' => '\\OC\\Memcache\\Redis',
|
||||||
'redis' => [
|
'trusted_proxies' =>
|
||||||
'host' => 'redis',
|
array (
|
||||||
'port' => 6379,
|
0 => 'traefik',
|
||||||
],
|
1 => '172.16.0.0/12',
|
||||||
'default_phone_region' => 'DE',
|
2 => '192.168.0.0/16',
|
||||||
'hsts' => true,
|
3 => '10.0.0.0/8',
|
||||||
'hstsMaxAge' => 15552000,
|
),
|
||||||
'hstsIncludeSubdomains' => true,
|
'trusted_domains' =>
|
||||||
);
|
array (
|
||||||
|
0 => 'localhost',
|
||||||
|
1 => 'nasarek.dev',
|
||||||
|
2 => 'drive.nasarek.dev',
|
||||||
|
3 => 'nextcloud-reverse-proxy',
|
||||||
|
4 => 'onlyoffice-documentserver',
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
@ -23,7 +23,8 @@ services:
|
||||||
- "traefik.enable=false"
|
- "traefik.enable=false"
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud-data:/var/www/html
|
- nextcloud-data:/var/www/html
|
||||||
#- ./hooks/post-installation:/docker-entrypoint-hooks.d/post-installation
|
- ./hooks/post-installation:/docker-entrypoint-hooks.d/post-installation
|
||||||
|
#- ./custom/custom-config.php:/var/www/html/config/custom-config.php
|
||||||
expose:
|
expose:
|
||||||
- 80
|
- 80
|
||||||
- 9000
|
- 9000
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,11 @@ http {
|
||||||
|
|
||||||
include /etc/nginx/mime.types;
|
include /etc/nginx/mime.types;
|
||||||
default_type application/octet-stream;
|
default_type application/octet-stream;
|
||||||
|
|
||||||
|
# Add custom MIME type for .mjs files
|
||||||
|
types {
|
||||||
|
text/javascript mjs;
|
||||||
|
}
|
||||||
|
|
||||||
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
|
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
|
||||||
'$status $body_bytes_sent "$http_referer" '
|
'$status $body_bytes_sent "$http_referer" '
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue