From 951a3d061654a62a1103c2b9fe694456e1e36dfb Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 2 Sep 2019 10:37:30 -0700 Subject: [PATCH] Some fixes for ansible. - Also updating the nginx template - Updating deploy.sh --- ansible/lemmy.yml | 10 ++++++++++ ansible/templates/nginx.conf | 2 +- docker/dev/deploy.sh | 4 ++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ansible/lemmy.yml b/ansible/lemmy.yml index 4ba80e90a..456932ef3 100644 --- a/ansible/lemmy.yml +++ b/ansible/lemmy.yml @@ -6,6 +6,7 @@ gather_facts: False pre_tasks: - name: install python for Ansible + become: true raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal python-setuptools) args: executable: /bin/bash @@ -15,21 +16,25 @@ tasks: - name: install dependencies + become: true apt: pkg: ['nginx', 'docker-compose', 'docker.io', 'certbot', 'python-certbot-nginx'] - name: request initial letsencrypt certificate + become: true command: certbot certonly --nginx --agree-tos -d '{{ domain }}' -m '{{ letsencrypt_contact_email }}' args: creates: '/etc/letsencrypt/live/{{domain}}/privkey.pem' - name: create lemmy folder + become: true file: path={{item.path}} state=directory with_items: - { path: '/lemmy/' } - { path: '/lemmy/volumes/' } - name: add all template files + become: true template: src={{item.src}} dest={{item.dest}} with_items: - { src: 'templates/env', dest: '/lemmy/.env' } @@ -40,6 +45,7 @@ jwt_password: "{{ lookup('password', 'passwords/{{ inventory_hostname }}/jwt chars=ascii_letters,digits') }}" - name: set env file permissions + become: true file: path: "/lemmy/.env" state: touch @@ -48,21 +54,25 @@ modification_time: preserve - name: enable and start docker service + become: true systemd: name: docker enabled: yes state: started - name: start docker-compose + become: true docker_compose: project_src: /lemmy/ state: present pull: yes - name: reload nginx with new config + become: true shell: nginx -s reload - name: certbot renewal cronjob + become: true cron: special_time=daily name=certbot-renew-lemmy diff --git a/ansible/templates/nginx.conf b/ansible/templates/nginx.conf index 74fbcda97..e9fef1816 100644 --- a/ansible/templates/nginx.conf +++ b/ansible/templates/nginx.conf @@ -47,7 +47,7 @@ server { add_header X-XSS-Protection "1; mode=block"; location / { - rewrite (\/(user|u\/|inbox|post|community|c\/|login|search|sponsors|communities|modlog|home)+) /static/index.html break; + rewrite (\/(user|u\/|inbox|post|community|c\/|create_post|create_community|login|search|setup|sponsors|communities|modlog|home)+) /static/index.html break; proxy_pass http://0.0.0.0:8536; proxy_set_header X-Real-IP $remote_addr; proxy_set_header Host $host; diff --git a/docker/dev/deploy.sh b/docker/dev/deploy.sh index 5982318a2..e7ab706ff 100755 --- a/docker/dev/deploy.sh +++ b/docker/dev/deploy.sh @@ -25,3 +25,7 @@ git push ./docker_update.sh docker tag dev_lemmy:latest dessalines/lemmy:$new_tag docker push dessalines/lemmy:$new_tag + +# Pushing to any ansible deploys +cd ../../ansible +ansible-playbook lemmy.yml