Fixing ansible install. (#1150)

* Fixing ansible install.

* Fixing LEMMY_EXTERNAL_HOST docs.

diff --git a/ansible/lemmy.yml b/ansible/lemmy.yml
index 3520c4042934d9646167a50560ee79ebf29abcdd..b4187158fa4e84b1e169cd8ca4a967e8ccc16455 100644 (file)
--- a/ansible/lemmy.yml
+++ b/ansible/lemmy.yml
@@ -77,6 +77,7 @@
           mode: '0600'
       vars:
         lemmy_docker_image: "dessalines/lemmy:{{ lookup('file', 'VERSION') }}"
+        lemmy_docker_ui_image: "dessalines/lemmy-ui:{{ lookup('file', 'VERSION') }}"
         lemmy_port: "8536"
         pictshare_port: "8537"
         iframely_port: "8538"

diff --git a/ansible/templates/docker-compose.yml b/ansible/templates/docker-compose.yml
index f4c94fd71dba5536bc4a1a74d28027f540239ee9..ca20f3ff8d4c759e1cccf7af67bd9b7125150ad2 100644 (file)
--- a/ansible/templates/docker-compose.yml
+++ b/ansible/templates/docker-compose.yml
@@ -15,6 +15,17 @@ services:
       - pictrs
       - iframely
 
+  lemmy-ui:
+    image: {{ lemmy_docker_ui_image }}
+    ports:
+      - "127.0.0.1:1235:1234"
+    environment:
+      - LEMMY_INTERNAL_HOST=lemmy:8536
+      - LEMMY_EXTERNAL_HOST={{ domain }}
+      - LEMMY_HTTPS=true
+    depends_on: 
+      - lemmy
+
   postgres:
     image: postgres:12-alpine
     environment:

diff --git a/docs/src/administration_install_docker.md b/docs/src/administration_install_docker.md
index ae0375a81614ffd0ed4b049b5c4a6dd413fe92e6..311655a36a10779498eb90bedd3b49be8bf840e6 100644 (file)
--- a/docs/src/administration_install_docker.md
+++ b/docs/src/administration_install_docker.md
@@ -17,6 +17,14 @@ mkdir -p volumes/pictrs
 sudo chown -R 991:991 volumes/pictrs
 ```
 
+Open up your `docker-compose.yml`, and make sure `LEMMY_EXTERNAL_HOST` for `lemmy-ui` is set to your correct host.
+
+```
+- LEMMY_INTERNAL_HOST=lemmy:8536
+- LEMMY_EXTERNAL_HOST=your-domain.com
+- LEMMY_HTTPS=false
+```
+
 After this, have a look at the [config file](administration_configuration.md) named `lemmy.hjson`, and adjust it, in particular the hostname, and possibly the db password. Then run:
 
 `docker-compose up -d`