From 786be3fa668903b92ac280691c4e4e50470ad74c Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sat, 28 Dec 2019 16:06:37 -0500 Subject: Config fixes. - Adding front_end_dir to settings. - Adding unit test for PasswordResetRequest encryption. - Readme points to lemmy.hjson - Fixing docker prod, dev, and ansible builds. - Removing redundant env files, as all config is now in a single file. - Some formatting fixes. --- ansible/lemmy.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'ansible/lemmy.yml') diff --git a/ansible/lemmy.yml b/ansible/lemmy.yml index acdb6b06..7243afdd 100644 --- a/ansible/lemmy.yml +++ b/ansible/lemmy.yml @@ -32,22 +32,13 @@ - name: add all template files template: src={{item.src}} dest={{item.dest}} with_items: - - { src: 'templates/env', dest: '/lemmy/.env' } - - { src: 'templates/config.hjson', dest: '/lemmy/config.hjson' } + - { src: '../docker/lemmy.hjson', dest: '/lemmy/lemmy.hjson' } - { src: '../docker/prod/docker-compose.yml', dest: '/lemmy/docker-compose.yml' } - { src: 'templates/nginx.conf', dest: '/etc/nginx/sites-enabled/lemmy.conf' } vars: postgres_password: "{{ lookup('password', 'passwords/{{ inventory_hostname }}/postgres chars=ascii_letters,digits') }}" jwt_password: "{{ lookup('password', 'passwords/{{ inventory_hostname }}/jwt chars=ascii_letters,digits') }}" - - name: set env file permissions - file: - path: "/lemmy/.env" - state: touch - mode: 0600 - access_time: preserve - modification_time: preserve - - name: enable and start docker service systemd: name: docker -- cgit v1.2.3