hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 10:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Phpversion is now passed in args to vagrant up function

Browse Source
This commit is contained in:
Xavier Rousset
2018-02-16 19:03:54 +01:00
parent 66383580bf
commit 4b4cecc35d
12 changed files with 70 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Vagrantfile vendored
View File

@@ -88,6 +88,7 @@ Vagrant.configure("2") do |config|
ansible.extra_vars = { ansible.extra_vars = {
hostname: $hostname, hostname: $hostname,
host_addresses: $hostIps, host_addresses: $hostIps,
phpversion: ENV['phpversion'],
postfix: { postfix: {
postfix_domain: $hostname + ".vb" postfix_domain: $hostname + ".vb"
} }
@@ -104,7 +105,7 @@ Vagrant.configure("2") do |config|
} }
end end
else else
config.vm.provision :shell, path: "resources/ansible/windows.sh", args: ["default"] config.vm.provision :shell, path: "resources/ansible/windows.sh", args: ["default", ENV['phpversion']]
# config.vm.provision :shell, run: "always", path: "resources/ansible/windows-always.sh", args: ["default"] # config.vm.provision :shell, run: "always", path: "resources/ansible/windows-always.sh", args: ["default"]
end end

4
resources/ansible/roles/nginx/templates/default.j2
View File

@@ -25,7 +25,7 @@ server {
location ~ ^/(index|index_dev|api|api_dev)\.php(/|$) { location ~ ^/(index|index_dev|api|api_dev)\.php(/|$) {
root {{ nginx.docroot }}/www; root {{ nginx.docroot }}/www;
fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:/var/run/php/php5.6-fpm.sock; fastcgi_pass unix:/var/run/php/php{{ phpversion }}-fpm.sock;
fastcgi_index index.php; fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH /usr/local/bin:/usr/bin:/bin; fastcgi_param PATH /usr/local/bin:/usr/bin:/bin;
@@ -63,7 +63,7 @@ server {
location ~ ^/(index|index_dev|api)\.php(/|$) { location ~ ^/(index|index_dev|api)\.php(/|$) {
root {{ nginx.docroot }}/www; root {{ nginx.docroot }}/www;
fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:/var/run/php/php5.6-fpm.sock; fastcgi_pass unix:/var/run/php/php{{ phpversion }}-fpm.sock;
fastcgi_index index.php; fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH /usr/local/bin:/usr/bin:/bin; fastcgi_param PATH /usr/local/bin:/usr/bin:/bin;

4
resources/ansible/roles/php/handlers/main.yml
View File

@@ -1,3 +1,3 @@
--- ---
- name: restart php5.6-fpm - name: restart php{{ phpversion }}-fpm
service: name=php5.6-fpm enabled=yes state=restarted service: name=php{{ phpversion }}-fpm enabled=yes state=restarted

6
resources/ansible/roles/php/tasks/configure.yml
View File

@@ -1,11 +1,11 @@
--- ---
- stat: path=/etc/php/5.6/apache2/php.ini - stat: path=/etc/php/{{ phpversion }}/apache2/php.ini
register: modphp register: modphp
- stat: path=/etc/php/5.6/fpm/php.ini - stat: path=/etc/php/{{ phpversion }}/fpm/php.ini
register: phpfpm register: phpfpm
- stat: path=/etc/php/5.6/cli/php.ini - stat: path=/etc/php/{{ phpversion }}/cli/php.ini
register: phpcli register: phpcli
- include: php-fpm.yml - include: php-fpm.yml

10
resources/ansible/roles/php/tasks/main.yml
View File

@@ -1,12 +1,12 @@
--- ---
# Watch repositories task to retrieve repository add # Watch repositories task to retrieve repository add
- name: Install php5.6 - name: Install php{{ phpversion }}
sudo: yes sudo: yes
apt: pkg=php5.6 state=latest apt: pkg=php{{ phpversion }} state=latest
- name: Install php5.6-fpm - name: Install php{{ phpversion }}-fpm
sudo: yes sudo: yes
apt: pkg=php5.6-fpm state=latest apt: pkg=php{{ phpversion }}-fpm state=latest
- name: Install PHP Packages - name: Install PHP Packages
sudo: yes sudo: yes
@@ -15,4 +15,4 @@
when: php.packages is defined when: php.packages is defined
- include: configure.yml - include: configure.yml
# - include: pecl.yml - include: pecl.yml

12
resources/ansible/roles/php/tasks/mod-php.yml
View File

@@ -1,30 +1,30 @@
--- ---
- name: ensure timezone is set in apache2 php.ini - name: ensure timezone is set in apache2 php.ini
lineinfile: dest=/etc/php/5.6/apache2/php.ini lineinfile: dest=/etc/php/{{ phpversion }}/apache2/php.ini
regexp='date.timezone =' regexp='date.timezone ='
line='date.timezone = {{ server.timezone }}' line='date.timezone = {{ server.timezone }}'
- name: enabling opcache - name: enabling opcache
lineinfile: dest=/etc/php/5.6/apache2/php.ini lineinfile: dest=/etc/php/{{ phpversion }}/apache2/php.ini
regexp=';?opcache.enable=\d' regexp=';?opcache.enable=\d'
line='opcache.enable=1' line='opcache.enable=1'
- name: Disable PHP cache limiter - name: Disable PHP cache limiter
lineinfile: dest=/etc/php/5.6/apache2/php.ini lineinfile: dest=/etc/php/{{ phpversion }}/apache2/php.ini
regexp=';?\s*session.cache_limiter\s*=\s*' regexp=';?\s*session.cache_limiter\s*=\s*'
line='session.cache_limiter = ""' line='session.cache_limiter = ""'
- name: set post_max_size - name: set post_max_size
lineinfile: dest=/etc/php/5.6/apache2/php.ini lineinfile: dest=/etc/php/{{ phpversion }}/apache2/php.ini
regexp=';?post_max_size\s*=\s*' regexp=';?post_max_size\s*=\s*'
line='post_max_size = 2G' line='post_max_size = 2G'
- name: set upload_max_filesize - name: set upload_max_filesize
lineinfile: dest=/etc/php/5.6/apache2/php.ini lineinfile: dest=/etc/php/{{ phpversion }}/apache2/php.ini
regexp=';?upload_max_filesize\s*=\s*' regexp=';?upload_max_filesize\s*=\s*'
line='upload_max_filesize = 2G' line='upload_max_filesize = 2G'
- name: set max_input_vars - name: set max_input_vars
lineinfile: dest=/etc/php/5.6/apache2/php.ini lineinfile: dest=/etc/php/{{ phpversion }}/apache2/php.ini
regexp=';?max_input_vars\s*=\s*' regexp=';?max_input_vars\s*=\s*'
line='max_input_vars = 12000' line='max_input_vars = 12000'

4
resources/ansible/roles/php/tasks/pecl.yml
View File

@@ -1,5 +1,5 @@
- name: Install - name: Install
apt: pkg="php5.6-dev" state=present apt: pkg="php{{ phpversion }}-dev" state=present
when: php.pecl_packages is defined when: php.pecl_packages is defined
- name: Update pecl chennel - name: Update pecl chennel
@@ -16,7 +16,7 @@
- name: Create extension .ini file - name: Create extension .ini file
template: > template: >
src="extension.tpl" src="extension.tpl"
dest="/etc/php/5.6/mods-available/{{ item.name }}.ini" dest="/etc/php/{{ phpversion }}/mods-available/{{ item.name }}.ini"
owner="root" owner="root"
group="root" group="root"
mode=0644 mode=0644

12
resources/ansible/roles/php/tasks/php-cli.yml
View File

@@ -1,30 +1,30 @@
--- ---
- name: ensure timezone is set in cli php.ini - name: ensure timezone is set in cli php.ini
lineinfile: dest=/etc/php/5.6/cli/php.ini lineinfile: dest=/etc/php/{{ phpversion }}/cli/php.ini
regexp='date.timezone =' regexp='date.timezone ='
line='date.timezone = {{ server.timezone }}' line='date.timezone = {{ server.timezone }}'
- name: enabling opcache cli - name: enabling opcache cli
lineinfile: dest=/etc/php/5.6/cli/php.ini lineinfile: dest=/etc/php/{{ phpversion }}/cli/php.ini
regexp=';?opcache.enable_cli=\d' regexp=';?opcache.enable_cli=\d'
line='opcache.enable_cli=1' line='opcache.enable_cli=1'
- name: Disable PHP cache limiter - name: Disable PHP cache limiter
lineinfile: dest=/etc/php/5.6/cli/php.ini lineinfile: dest=/etc/php/{{ phpversion }}/cli/php.ini
regexp=';?\s*session.cache_limiter\s*=\s*' regexp=';?\s*session.cache_limiter\s*=\s*'
line='session.cache_limiter = ""' line='session.cache_limiter = ""'
- name: set post_max_size - name: set post_max_size
lineinfile: dest=/etc/php/5.6/cli/php.ini lineinfile: dest=/etc/php/{{ phpversion }}/cli/php.ini
regexp=';?post_max_size\s*=\s*' regexp=';?post_max_size\s*=\s*'
line='post_max_size = 2G' line='post_max_size = 2G'
- name: set upload_max_filesize - name: set upload_max_filesize
lineinfile: dest=/etc/php/5.6/cli/php.ini lineinfile: dest=/etc/php/{{ phpversion }}/cli/php.ini
regexp=';?upload_max_filesize\s*=\s*' regexp=';?upload_max_filesize\s*=\s*'
line='upload_max_filesize = 2G' line='upload_max_filesize = 2G'
- name: set max_input_vars - name: set max_input_vars
lineinfile: dest=/etc/php/5.6/cli/php.ini lineinfile: dest=/etc/php/{{ phpversion }}/cli/php.ini
regexp=';?max_input_vars\s*=\s*' regexp=';?max_input_vars\s*=\s*'
line='max_input_vars = 12000' line='max_input_vars = 12000'

36
resources/ansible/roles/php/tasks/php-fpm.yml
View File

@@ -1,48 +1,48 @@
--- ---
- name: Set permissions on socket - owner - name: Set permissions on socket - owner
lineinfile: "dest=/etc/php/5.6/fpm/pool.d/www.conf state=present regexp='^;?listen.owner' line='listen.owner = www-data'" lineinfile: "dest=/etc/php/{{ phpversion }}/fpm/pool.d/www.conf state=present regexp='^;?listen.owner' line='listen.owner = www-data'"
notify: restart php5.6-fpm notify: restart php{{ phpversion }}-fpm
- name: Set permissions on socket - group - name: Set permissions on socket - group
lineinfile: "dest=/etc/php/5.6/fpm/pool.d/www.conf state=present regexp='^;?listen.group' line='listen.group = www-data'" lineinfile: "dest=/etc/php/{{ phpversion }}/fpm/pool.d/www.conf state=present regexp='^;?listen.group' line='listen.group = www-data'"
notify: restart php5.6-fpm notify: restart php{{ phpversion }}-fpm
- name: Set permissions on socket - mode - name: Set permissions on socket - mode
lineinfile: "dest=/etc/php/5.6/fpm/pool.d/www.conf state=present regexp='^;?listen.mode' line='listen.mode = 0660'" lineinfile: "dest=/etc/php/{{ phpversion }}/fpm/pool.d/www.conf state=present regexp='^;?listen.mode' line='listen.mode = 0660'"
notify: restart php5.6-fpm notify: restart php{{ phpversion }}-fpm
- name: ensure timezone is set in fpm php.ini - name: ensure timezone is set in fpm php.ini
lineinfile: dest=/etc/php/5.6/fpm/php.ini lineinfile: dest=/etc/php/{{ phpversion }}/fpm/php.ini
regexp='date.timezone =' regexp='date.timezone ='
line='date.timezone = {{ server.timezone }}' line='date.timezone = {{ server.timezone }}'
notify: restart php5.6-fpm notify: restart php{{ phpversion }}-fpm
- name: enabling opcache - name: enabling opcache
lineinfile: dest=/etc/php/5.6/fpm/php.ini lineinfile: dest=/etc/php/{{ phpversion }}/fpm/php.ini
regexp=';?opcache.enable=\d' regexp=';?opcache.enable=\d'
line='opcache.enable=1' line='opcache.enable=1'
notify: restart php5.6-fpm notify: restart php{{ phpversion }}-fpm
- name: Disable PHP cache limiter - name: Disable PHP cache limiter
lineinfile: dest=/etc/php/5.6/fpm/php.ini lineinfile: dest=/etc/php/{{ phpversion }}/fpm/php.ini
regexp=';?\s*session.cache_limiter\s*=\s*' regexp=';?\s*session.cache_limiter\s*=\s*'
line='session.cache_limiter = ""' line='session.cache_limiter = ""'
notify: restart php5.6-fpm notify: restart php{{ phpversion }}-fpm
- name: set post_max_size - name: set post_max_size
lineinfile: dest=/etc/php/5.6/fpm/php.ini lineinfile: dest=/etc/php/{{ phpversion }}/fpm/php.ini
regexp=';?post_max_size\s*=\s*' regexp=';?post_max_size\s*=\s*'
line='post_max_size = 2G' line='post_max_size = 2G'
notify: restart php5.6-fpm notify: restart php{{ phpversion }}-fpm
- name: set upload_max_filesize - name: set upload_max_filesize
lineinfile: dest=/etc/php/5.6/fpm/php.ini lineinfile: dest=/etc/php/{{ phpversion }}/fpm/php.ini
regexp=';?upload_max_filesize\s*=\s*' regexp=';?upload_max_filesize\s*=\s*'
line='upload_max_filesize = 2G' line='upload_max_filesize = 2G'
notify: restart php5.6-fpm notify: restart php{{ phpversion }}-fpm
- name: set max_input_vars - name: set max_input_vars
lineinfile: dest=/etc/php/5.6/fpm/php.ini lineinfile: dest=/etc/php/{{ phpversion }}/fpm/php.ini
regexp=';?max_input_vars\s*=\s*' regexp=';?max_input_vars\s*=\s*'
line='max_input_vars = 12000' line='max_input_vars = 12000'
notify: restart php5.6-fpm notify: restart php{{ phpversion }}-fpm

2
resources/ansible/roles/xdebug/tasks/main.yml
View File

@@ -5,5 +5,5 @@
- name: Copy xdebug INI into mods-available folder. - name: Copy xdebug INI into mods-available folder.
template: > template: >
src=xdebug.ini.j2 src=xdebug.ini.j2
dest=/etc/php/5.6/mods-available/xdebug.ini dest=/etc/php/{{ phpversion }}/mods-available/xdebug.ini
owner=root group=root mode=644 owner=root group=root mode=644

41
resources/ansible/vars/all.yml
View File

@@ -62,29 +62,30 @@ elasticsearch:
php: php:
install: '1' install: '1'
ppa: php ppa: php
version: '{{ phpversion }}'
packages: packages:
- 'php5.6-cli' - 'php{{ phpversion }}-cli'
- 'php5.6-fpm' - 'php{{ phpversion }}-fpm'
- 'php5.6-intl' - 'php{{ phpversion }}-intl'
- 'php5.6-mcrypt' - 'php{{ phpversion }}-mcrypt'
- 'php5.6-enchant' - 'php{{ phpversion }}-enchant'
- 'php5.6-gd' - 'php{{ phpversion }}-gd'
- 'php5.6-memcache' - 'php{{ phpversion }}-memcache'
- 'php5.6-xml' - 'php{{ phpversion }}-xml'
- 'php5.6-xmlrpc' - 'php{{ phpversion }}-xmlrpc'
- 'php5.6-memcached' - 'php{{ phpversion }}-memcached'
- 'php5.6-mbstring' - 'php{{ phpversion }}-mbstring'
- 'php5.6-curl' - 'php{{ phpversion }}-curl'
- 'php5.6-mysql' - 'php{{ phpversion }}-mysql'
- 'php5.6-imagick' - 'php{{ phpversion }}-imagick'
- 'php5.6-zip' - 'php{{ phpversion }}-zip'
- 'php5.6-sqlite3' - 'php{{ phpversion }}-sqlite3'
- 'php5.6-bcmath' - 'php{{ phpversion }}-bcmath'
- 'php-pear' - 'php-pear'
- 'php5.6-dev' - 'php{{ phpversion }}-dev'
pecl_packages: pecl_packages:
        - {name: zmq, package: zmq-beta} - {name: zmq, package: zmq-beta}
        - {name: amqp, package: amqp-1.9.3} - {name: amqp, package: amqp-1.9.3}
node: node:
install: '1' install: '1'
version: '9.4.0' version: '9.4.0'

2
resources/ansible/windows.sh
View File

@@ -28,4 +28,4 @@ sudo apt-get install -y ansible
cp /vagrant/resources/ansible/inventories/dev /etc/ansible/hosts -f cp /vagrant/resources/ansible/inventories/dev /etc/ansible/hosts -f
chmod 666 /etc/ansible/hosts chmod 666 /etc/ansible/hosts
cat /vagrant/resources/ansible/files/authorized_keys >> /home/vagrant/.ssh/authorized_keys cat /vagrant/resources/ansible/files/authorized_keys >> /home/vagrant/.ssh/authorized_keys
sudo ansible-playbook /vagrant/resources/ansible/playbook.yml -e hostname=$1 --connection=local sudo ansible-playbook /vagrant/resources/ansible/playbook.yml -e hostname=$1 phpversion=$2 --connection=local