From 0a137e6f0175f978508bded653c64510f048cf50 Mon Sep 17 00:00:00 2001 From: Thibaud Fabre Date: Wed, 5 Oct 2016 16:19:40 +0200 Subject: [PATCH] Add some missing Phraseanet dependencies to provisioning --- Vagrantfile | 2 +- resources/ansible/roles/php/tasks/pecl.yml | 6 +++--- resources/ansible/roles/server/tasks/main.yml | 4 ++-- resources/ansible/vars/all.yml | 4 ++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 84884aceed..25c71c028c 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -92,7 +92,7 @@ Vagrant.configure("2") do |config| config.vm.provision "ansible", run: "always" do |ansible| ansible.playbook = "resources/ansible/playbook-always.yml" ansible.limit = 'all' - ansible.verbose = 'vvv' + ansible.verbose = 'v' ansible.extra_vars = { host_addresses: $hostIps, hostname: $hostname diff --git a/resources/ansible/roles/php/tasks/pecl.yml b/resources/ansible/roles/php/tasks/pecl.yml index fefc6e67a3..59cd876f9f 100644 --- a/resources/ansible/roles/php/tasks/pecl.yml +++ b/resources/ansible/roles/php/tasks/pecl.yml @@ -7,7 +7,7 @@ register: pecl_result changed_when: "'already installed' not in pecl_result.stdout" failed_when: "pecl_result.stderr or ('ERROR' in pecl_result.stdout)" - with_items: php.pecl_packages + with_items: '{{ php.pecl_packages }}' when: php.pecl_packages is defined - name: Create extension .ini file @@ -17,10 +17,10 @@ owner="root" group="root" mode=0644 - with_items: php.pecl_packages + with_items: '{{ php.pecl_packages }}' when: php.pecl_packages is defined - name: Enable extension shell: php5enmod {{ item.name }} - with_items: php.pecl_packages + with_items: '{{ php.pecl_packages }}' when: php.pecl_packages is defined diff --git a/resources/ansible/roles/server/tasks/main.yml b/resources/ansible/roles/server/tasks/main.yml index 1e35c28879..d1aac1d10f 100644 --- a/resources/ansible/roles/server/tasks/main.yml +++ b/resources/ansible/roles/server/tasks/main.yml @@ -15,7 +15,7 @@ - name: Install Extra Packages sudo: yes apt: pkg={{ item }} state=latest - with_items: server.packages + with_items: '{{ server.packages }}' when: server.packages is defined - name: Configure the timezone @@ -27,6 +27,6 @@ file: src=/usr/share/zoneinfo/{{server.timezone}} dest=/etc/localtime state=link force=yes backup=yes - name: Set default system language pack - shell: locale-gen {{server.locales|join(' ')}} + shell: locale-gen {{ server.locales|join(' ') }} sudo: yes diff --git a/resources/ansible/vars/all.yml b/resources/ansible/vars/all.yml index 0f2812a18a..d20418934f 100644 --- a/resources/ansible/vars/all.yml +++ b/resources/ansible/vars/all.yml @@ -16,6 +16,10 @@ server: - memcached - build-essential - libssl-dev + - unoconv + - swftools + - xpdf + - libav-tools timezone: UTC locales: - en_GB.UTF-8