summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDessalines <tyhou13@gmx.com>2019-09-04 12:54:23 -0700
committerDessalines <tyhou13@gmx.com>2019-09-04 12:54:23 -0700
commit05fa6837c40fcae21688e8245a5350425aa7d61b (patch)
tree8a54dcd10583313abaa57dcefa6311c6effc5fbe
parent8c961dfd808763dc221eae3793c799c499e352f0 (diff)
Adding become to ansible from command line instead.
-rw-r--r--README.md2
-rw-r--r--ansible/lemmy.yml10
-rwxr-xr-xdocker/dev/deploy.sh2
3 files changed, 2 insertions, 12 deletions
diff --git a/README.md b/README.md
index 22e39b7d..8d078abc 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,7 @@ git clone https://github.com/dessalines/lemmy.git
cd lemmy/ansible/
cp inventory.example inventory
nano inventory # enter your server, domain, contact email
-ansible-playbook lemmy.yml
+ansible-playbook lemmy.yml --become
```
## Develop
diff --git a/ansible/lemmy.yml b/ansible/lemmy.yml
index 456932ef..4ba80e90 100644
--- a/ansible/lemmy.yml
+++ b/ansible/lemmy.yml
@@ -6,7 +6,6 @@
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
@@ -16,25 +15,21 @@
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' }
@@ -45,7 +40,6 @@
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
@@ -54,25 +48,21 @@
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/docker/dev/deploy.sh b/docker/dev/deploy.sh
index e7ab706f..edceaa90 100755
--- a/docker/dev/deploy.sh
+++ b/docker/dev/deploy.sh
@@ -28,4 +28,4 @@ docker push dessalines/lemmy:$new_tag
# Pushing to any ansible deploys
cd ../../ansible
-ansible-playbook lemmy.yml
+ansible-playbook lemmy.yml --become