Fixes
This commit is contained in:
parent
fd2ac3ea27
commit
648c679b03
6
Makefile
6
Makefile
@ -2,8 +2,7 @@ configure:
|
||||
ansible-playbook \
|
||||
--inventory "ansible/hosts_prod" \
|
||||
--extra-vars='ansible_python_interpreter=/usr/bin/python3' \
|
||||
--become \
|
||||
--become-user=av \
|
||||
--user=av \
|
||||
--ask-become-pass \
|
||||
ansible/configuration.yml
|
||||
|
||||
@ -11,8 +10,7 @@ dry-run:
|
||||
ansible-playbook \
|
||||
--inventory "ansible/hosts_prod" \
|
||||
--extra-vars='ansible_python_interpreter=/usr/bin/python3' \
|
||||
--become \
|
||||
--become-user=av \
|
||||
--user=av \
|
||||
--ask-become-pass \
|
||||
--check \
|
||||
--diff \
|
||||
|
@ -29,10 +29,6 @@
|
||||
php_date_timezone: '{{ timezone }}'
|
||||
|
||||
pre_tasks:
|
||||
- name: Ensure that PHP PPA is added.
|
||||
apt_repository: repo=ppa:ondrej/php state=present
|
||||
- name: Update apt cache
|
||||
apt: update_cache=yes cache_valid_time=86400
|
||||
- name: Install system packages
|
||||
apt: pkg={{ item }} state=latest
|
||||
with_items:
|
||||
@ -42,6 +38,10 @@
|
||||
- python-software-properties
|
||||
- wget
|
||||
- zip
|
||||
- name: Ensure that PHP PPA is added.
|
||||
apt_repository: repo=ppa:ondrej/php state=present
|
||||
- name: Update apt cache
|
||||
apt: update_cache=yes cache_valid_time=86400
|
||||
- name: Add deploy user
|
||||
user:
|
||||
name: '{{ deploy_user }}'
|
||||
@ -54,5 +54,5 @@
|
||||
- geerlingguy.php
|
||||
|
||||
- homepage
|
||||
- s2photo
|
||||
- notes
|
||||
# - s2photo
|
||||
# - notes
|
||||
|
@ -3,7 +3,7 @@ notes_name: notes
|
||||
notes_owner: notes_owner
|
||||
notes_dir: /var/www/notes
|
||||
notes_web_root: '{{ notes_dir }}/current/web'
|
||||
notes_domain: 'notes.anwinged.ru'
|
||||
notes_domain: 'notes.vakhrushev.me'
|
||||
notes_cert_type: 'letsencrypt'
|
||||
notes_dbname: notes_db
|
||||
notes_dbuser: notes_db
|
||||
|
Loading…
Reference in New Issue
Block a user