diff options
| author | Felix Ableitner <me@nutomic.com> | 2020-06-09 14:01:26 +0200 |
|---|---|---|
| committer | Felix Ableitner <me@nutomic.com> | 2020-06-09 14:01:26 +0200 |
| commit | 0f1a8ec928a36d73490a41a778244578f39dd626 (patch) | |
| tree | e55ec80acbb258197ce899cefe6e1b24e09ad2fb /docker | |
| parent | 5c6601cb2a819d20b0f0d17f3575aff006a47fd2 (diff) | |
| parent | a13e9fe3959e07f901ba0647dfd7f749865a900d (diff) | |
Merge branch 'master' into federation
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/dev/docker-compose.yml | 2 | ||||
| -rw-r--r-- | docker/lemmy.hjson | 4 | ||||
| -rw-r--r-- | docker/prod/docker-compose.yml | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index 556c67bd..3fc94099 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -28,7 +28,7 @@ services: - iframely pictshare: - image: shtripok/pictshare:latest + image: hascheksolutions/pictshare:latest ports: - "127.0.0.1:8537:80" volumes: diff --git a/docker/lemmy.hjson b/docker/lemmy.hjson index b61ea826..271fc78d 100644 --- a/docker/lemmy.hjson +++ b/docker/lemmy.hjson @@ -23,9 +23,6 @@ jwt_secret: "changeme" # The dir for the front end front_end_dir: "/app/dist" - # whether to enable activitypub federation. this feature is in alpha, do not enable in production, as might - # cause problems like remote instances fetching and permanently storing bad data. - federation_enabled: false # rate limits for various user actions, by user ip rate_limit: { # maximum number of messages created in interval @@ -60,6 +57,7 @@ # smtp_password: "" # # address to send emails from, eg "info@your-instance.com" # smtp_from_address: "" +# use_tls: true # } } diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index c38bb899..db6e4004 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3.3' +version: '2.2' services: postgres: @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.51 + image: dessalines/lemmy:v0.6.71 ports: - "127.0.0.1:8536:8536" restart: always @@ -26,12 +26,13 @@ services: - iframely pictshare: - image: shtripok/pictshare:latest + image: hascheksolutions/pictshare:latest ports: - "127.0.0.1:8537:80" volumes: - ./volumes/pictshare:/usr/share/nginx/html/data restart: always + mem_limit: 100m iframely: image: dogbin/iframely:latest @@ -40,3 +41,4 @@ services: volumes: - ./iframely.config.local.js:/iframely/config.local.js:ro restart: always + mem_limit: 100m |