From 36e4b97f93a7bb36b142dd6d2d5040c36e4df8c2 Mon Sep 17 00:00:00 2001 From: Moctar Date: Fri, 12 Jan 2018 12:56:53 +0100 Subject: [PATCH 1/2] PHRAS-1794 and PHRAS-1804 : fix pecl-packages and node version --- resources/ansible/roles/node/tasks/main.yml | 2 +- resources/ansible/roles/php/tasks/main.yml | 2 +- resources/ansible/vars/all.yml | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/resources/ansible/roles/node/tasks/main.yml b/resources/ansible/roles/node/tasks/main.yml index 98780bb0dc..8d1c4d81d0 100644 --- a/resources/ansible/roles/node/tasks/main.yml +++ b/resources/ansible/roles/node/tasks/main.yml @@ -7,4 +7,4 @@ - name: Install specific nodejs version become: yes become_user: vagrant - shell: export NVM_DIR="$HOME/.nvm" &&. ~/.nvm/nvm.sh && nvm install 0.12.16 && nvm alias default 0.12.16 + shell: export NVM_DIR="$HOME/.nvm" &&. ~/.nvm/nvm.sh && nvm install {{ node.version }} && nvm alias default {{ node.version }} diff --git a/resources/ansible/roles/php/tasks/main.yml b/resources/ansible/roles/php/tasks/main.yml index 30c51aa34b..79e1212d38 100644 --- a/resources/ansible/roles/php/tasks/main.yml +++ b/resources/ansible/roles/php/tasks/main.yml @@ -15,4 +15,4 @@ when: php.packages is defined - include: configure.yml -- include: pecl.yml +# - include: pecl.yml diff --git a/resources/ansible/vars/all.yml b/resources/ansible/vars/all.yml index f8b797a1f2..70feeb9b07 100644 --- a/resources/ansible/vars/all.yml +++ b/resources/ansible/vars/all.yml @@ -80,10 +80,11 @@ php: - 'php5.6-sqlite3' - 'php5.6-bcmath' - 'php-pear' - pecl_packages: - - {name: zmq, package: php-zmq} - - {name: amqp, package: amqp-1.9.3} - + - 'php5.6-dev' + - 'php-zmq' + - 'php-amqp' +node: + version: '9.4.0' xdebug: install: '1' idekey: 'PHPSTORM' From 48ebfa0541e9084eece74584a05a1f7d1be77630 Mon Sep 17 00:00:00 2001 From: Moctar Date: Fri, 12 Jan 2018 15:22:28 +0100 Subject: [PATCH 2/2] PHRAS-1800 : add ffmpeg compilation and version as variable --- resources/ansible/playbook.yml | 27 ++++----- resources/ansible/roles/ffmpeg/tasks/main.yml | 57 +++++++++++++++++++ resources/ansible/vars/all.yml | 4 ++ 3 files changed, 75 insertions(+), 13 deletions(-) create mode 100644 resources/ansible/roles/ffmpeg/tasks/main.yml diff --git a/resources/ansible/playbook.yml b/resources/ansible/playbook.yml index 6ad46de8f0..dcff4afb3b 100644 --- a/resources/ansible/playbook.yml +++ b/resources/ansible/playbook.yml @@ -4,16 +4,17 @@ vars_files: - vars/all.yml roles: - - server - - repositories - - vagrant_local - - nginx - - mariadb - - elasticsearch - - rabbitmq - - php - - xdebug - - composer - - mailcatcher - - node - - app +# - server +# - repositories +# - vagrant_local +# - nginx +# - mariadb +# - elasticsearch +# - rabbitmq +# - php +# - xdebug +# - composer +# - mailcatcher +# - node +# - app + - ffmpeg diff --git a/resources/ansible/roles/ffmpeg/tasks/main.yml b/resources/ansible/roles/ffmpeg/tasks/main.yml new file mode 100644 index 0000000000..ae69ec62fe --- /dev/null +++ b/resources/ansible/roles/ffmpeg/tasks/main.yml @@ -0,0 +1,57 @@ +--- +# This playbook will compile and install FFmpeg and dependencies for Phraseanet + +- name: Install dependencies for ffmpeg compilation + apt: pkg={{ item }} state=latest + + with_items: + - yasm + - libvorbis-dev + - texi2html + - nasm + - zlib1g-dev + - libx264-dev + - libfdk-aac-dev + - libopus-dev + - libvpx-dev + - libmp3lame-dev + - libogg-dev + - libfaac-dev + - libopencore-amrnb-dev + - libopencore-amrwb-dev + - libdc1394-22-dev + - libx11-dev + - libswscale-dev + - libpostproc-dev + - libxvidcore-dev + - libtheora-dev + - libgsm1-dev + - libfreetype6-dev + +# Download FFMPEG + +- name: ffmpeg | Download + get_url: url=http://ffmpeg.org/releases/ffmpeg-{{ ffmpeg.version }}.tar.gz dest=/tmp/ffmpeg-{{ ffmpeg.version }}.tar.gz + +- name: ffmpeg | Untar + shell: tar xzvf ffmpeg-{{ ffmpeg.version }}.tar.gz + args: + chdir: "/tmp" + creates: "/tmp/ffmpeg-{{ ffmpeg.version }}" +- name: Compile | ffmpeg + shell: "export PATH=/usr/local/bin/:$PATH && {{ item }}" + args: + chdir: "/tmp/ffmpeg-{{ ffmpeg.version }}" + with_items: + - ./configure --enable-gpl --enable-nonfree --enable-libfaac --enable-libfdk_aac --enable-libgsm --enable-libmp3lame --enable-libtheora --enable-libvorbis --enable-libvpx --enable-libfreetype --enable-libopus --enable-libx264 --enable-libxvid --enable-zlib --enable-postproc --enable-swscale --enable-pthreads --enable-x11grab --enable-libdc1394 --enable-version3 --enable-libopencore-amrnb --enable-libopencore-amrwb + - make + - make install + - make distclean + +- name: delete ffmpeg sources files + file: + path: "{{ item }}" + state: absent + with_items: + - "/tmp/ffmpeg-{{ ffmpeg.version }}" + - "/tmp/ffmpeg-{{ ffmpeg.version }}.tar.gz" diff --git a/resources/ansible/vars/all.yml b/resources/ansible/vars/all.yml index 70feeb9b07..30e7c8948f 100644 --- a/resources/ansible/vars/all.yml +++ b/resources/ansible/vars/all.yml @@ -84,6 +84,7 @@ php: - 'php-zmq' - 'php-amqp' node: + install: '1' version: '9.4.0' xdebug: install: '1' @@ -96,3 +97,6 @@ composer: mailcatcher: install: '1' +ffmpeg: + install: '1' + version: '3.1.10'