Merge branch 'akkoma' of git.disroot.org:Disroot-Ansible/pleroma into akkoma
This commit is contained in:
commit
ab7d297798
|
@ -15,6 +15,6 @@ Vagrant.configure("2") do |config|
|
|||
pleroma.vm.network "forwarded_port", guest: 80, host: 8888, host_ip: "192.168.33.15"
|
||||
pleroma.vm.network "forwarded_port", guest: 443, host: 4443, host_ip: "192.168.33.15"
|
||||
pleroma.vm.network "private_network", ip: "192.168.33.15"
|
||||
|
||||
config.vm.provision "shell", inline: "apt install acl"
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
---
|
||||
|
||||
- include: user.yml
|
||||
- include_tasks: user.yml
|
||||
|
||||
- include: installdeps.yml
|
||||
- include_tasks: installdeps.yml
|
||||
|
||||
- include: configure.yml
|
||||
- include_tasks: configure.yml
|
||||
tags:
|
||||
- upgrade
|
||||
|
||||
|
@ -13,14 +13,14 @@
|
|||
path: '{{ pleroma_app_dir }}/release'
|
||||
register: pleroma_release
|
||||
|
||||
- include: install.yml
|
||||
- include_tasks: install.yml
|
||||
when: pleroma_release.stat.exists == False
|
||||
|
||||
- include: upgrade.yml
|
||||
- include_tasks: upgrade.yml
|
||||
tags:
|
||||
- upgrade
|
||||
- never
|
||||
|
||||
- include: frontends.yml
|
||||
- include_tasks: frontends.yml
|
||||
tags:
|
||||
- upgrade
|
||||
|
|
Loading…
Reference in New Issue