From 648c679b03f506ae868f96a810a987404a923332 Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Wed, 16 May 2018 22:18:04 +0300
Subject: [PATCH] Fixes

---
 Makefile                          |  6 ++----
 ansible/configuration.yml         | 12 ++++++------
 ansible/roles/notes/vars/main.yml |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index a51c7ab..c922566 100644
--- a/Makefile
+++ b/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 \
diff --git a/ansible/configuration.yml b/ansible/configuration.yml
index 37b5cf9..05789d1 100644
--- a/ansible/configuration.yml
+++ b/ansible/configuration.yml
@@ -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
diff --git a/ansible/roles/notes/vars/main.yml b/ansible/roles/notes/vars/main.yml
index 2f0e847..e381b35 100644
--- a/ansible/roles/notes/vars/main.yml
+++ b/ansible/roles/notes/vars/main.yml
@@ -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