summaryrefslogtreecommitdiffstats
path: root/ansible/templates
diff options
context:
space:
mode:
Diffstat (limited to 'ansible/templates')
-rw-r--r--ansible/templates/config.hjson2
-rw-r--r--ansible/templates/docker-compose.yml23
2 files changed, 11 insertions, 14 deletions
diff --git a/ansible/templates/config.hjson b/ansible/templates/config.hjson
index 42698dfb..c0f387c4 100644
--- a/ansible/templates/config.hjson
+++ b/ansible/templates/config.hjson
@@ -1,7 +1,7 @@
{
database: {
password: "{{ postgres_password }}"
- host: "lemmy_db"
+ host: "postgres"
}
hostname: "{{ domain }}"
jwt_secret: "{{ jwt_password }}"
diff --git a/ansible/templates/docker-compose.yml b/ansible/templates/docker-compose.yml
index bf9aeeb5..57ee142a 100644
--- a/ansible/templates/docker-compose.yml
+++ b/ansible/templates/docker-compose.yml
@@ -9,31 +9,32 @@ services:
volumes:
- ./lemmy.hjson:/config/config.hjson:ro
depends_on:
- - lemmy_db
- - lemmy_pictshare
+ - postgres
+ - pictshare
+ - iframely
- lemmy_db:
+ postgres:
image: postgres:12-alpine
environment:
- POSTGRES_USER=lemmy
- POSTGRES_PASSWORD={{ postgres_password }}
- POSTGRES_DB=lemmy
volumes:
- - lemmy_db:/var/lib/postgresql/data
+ - ./volumes/postgres:/var/lib/postgresql/data
restart: always
- lemmy_pictshare:
+ pictshare:
image: shtripok/pictshare:latest
ports:
- "127.0.0.1:8537:80"
volumes:
- - lemmy_pictshare:/usr/share/nginx/html/data
+ - ./volumes/pictshare:/usr/share/nginx/html/data
restart: always
- lemmy_iframely:
+ iframely:
image: dogbin/iframely:latest
ports:
- - "127.0.0.1:8061:8061"
+ - "127.0.0.1:8061:80"
volumes:
- ./iframely.config.local.js:/iframely/config.local.js:ro
restart: always
@@ -42,8 +43,4 @@ services:
image: mwader/postfix-relay
environment:
- POSTFIX_myhostname={{ domain }}
- restart: "always"
-volumes:
- lemmy_db:
- lemmy_pictshare:
- lemmy_iframely:
+ restart: "always" \ No newline at end of file