Fedora and RedHat provisioning fixes

Author: Jamie Snape

Vagrantfile

@@ -19,7 +19,7 @@
 # limitations under the License.
 #=============================================================================
 
-Vagrant.configure('2') do |config|
+Vagrant.configure(2) do |config|
     if Vagrant.has_plugin?('vagrant-cachier')
         config.cache.auto_detect = false
         config.cache.enable :apt
@@ -29,6 +29,18 @@ Vagrant.configure('2') do |config|
     end
     config.vm.box = 'ubuntu/trusty64'
     config.vm.network 'forwarded_port', guest: 80, host: 8080, auto_correct: true
+    config.vm.provider 'virtualbox' do |virtualbox|
+        virtualbox.cpus = 2
+        virtualbox.memory = 4096
+    end
+    config.vm.provider 'vmware_fusion' do |vmware_fusion|
+        vmware_fusion.vmx['memsize'] = 4096
+        vmware_fusion.vmx['numvcpus'] = 2
+    end
+    config.vm.provider 'vmware_workstation' do |vmware_workstation|
+        vmware_workstation.vmx['memsize'] = 4096
+        vmware_workstation.vmx['numvcpus'] = 2
+    end
     config.vm.provision 'ansible' do |ansible|
         ansible.playbook = 'provisioning/ansible/site.yml'
     end

docs/installation/linux.md

@@ -254,7 +254,7 @@ superset of the requirements for production:
 
 ```bash
 sudo yum update
-sudo yum install cmake curl git httpd mariadb-server memcached nano php php-gd php-mysqlnd php-pdo php-pecl-jsonc php-pecl-memcached php-pecl-xdebug php-pgsql postgresql-server python python-jinja2 python-markdown python-pip python-watchdog PyYAML sqlite subversion
+sudo yum install cmake curl git httpd mariadb-server memcached nano php php-bcmath php-gd php-mysqlnd php-pdo php-pecl-jsonc php-pecl-memcached php-pecl-xdebug php-pgsql postgresql-server python python-jinja2 python-markdown python-pip python-watchdog PyYAML sqlite subversion
 sudo pip install mkdocs
 sudo mkdir -p /var/www/example.org/html
 sudo chown $USER:$USER /var/www/example.org/html
@@ -303,10 +303,10 @@ sudo yum install php
 
 The mod_php5 Apache module is installed along with the PHP preprocessor.
 
-Install the GD and JSON-C PHP extensions:
+Install the BC Math, GD, and JSON-C PHP extensions:
 
 ```bash
-sudo yum install php-gd php-pecl-jsonc
+sudo yum install php-bcmath php-gd php-pecl-jsonc
 ```
 
 !!! important
@@ -527,7 +527,7 @@ superset of the requirements for production:
 ```bash
 sudo yum install epel-release
 sudo yum update
-sudo yum install cmake curl git httpd mariadb-server memcached nano php php-gd php-mysqlnd php-pdo php-pecl-memcached php-pecl-xdebug php-pgsql postgresql-server python python-jinja2 python-markdown python-pip PyYAML sqlite subversion
+sudo yum install cmake curl git httpd mariadb-server memcached nano php php-bcmath php-gd php-mysqlnd php-pdo php-pecl-memcached php-pecl-xdebug php-pgsql postgresql-server python python-jinja2 python-markdown python-pip PyYAML sqlite subversion
 sudo pip install mkdocs
 sudo mkdir -p /var/www/example.org/html
 sudo chown $USER:$USER /var/www/example.org/html
@@ -582,10 +582,10 @@ sudo yum install php
 
 The mod_php5 Apache module is installed along with the PHP preprocessor.
 
-Install the GD PHP extension:
+Install the BC Math and GD PHP extensions:
 
 ```bash
-sudo yum install php-gd
+sudo yum install php-bcmath php-gd
 ```
 
 The JSON PHP extension was previously installed along with the PHP

provisioning/ansible/roles/apache2/tasks/main.yml

@@ -39,6 +39,9 @@
     - sendmail
   when: ansible_pkg_mgr == 'yum'
 
+- name: start apache2
+  service: name={{ apache2_service }} state=started
+
 - name: enable rewrite module
   apache2_module: name=rewrite state=present
   notify:

provisioning/ansible/roles/apache2/templates/etc-httpd-conf.d-vagrant.conf.j2

@@ -7,6 +7,4 @@
 	ServerName localhost
 	ServerAdmin webmaster@localhost
 	DocumentRoot /var/www/vagrant
-	ErrorLog ${APACHE_LOG_DIR}/error.log
-	CustomLog ${APACHE_LOG_DIR}/access.log combined
 </VirtualHost>

provisioning/ansible/roles/common/tasks/main.yml

@@ -36,10 +36,6 @@
     - unzip
   when: ansible_pkg_mgr == 'apt'
 
-- name: yum update
-  yum: update_cache=yes
-  when: ansible_pkg_mgr == 'yum'
-
 - name: yum install epel-release
   yum: name=epel-release state=present
   when: ansible_distribution in ['CentOS', 'RedHat']

provisioning/ansible/roles/memcached/tasks/main.yml

@@ -35,3 +35,6 @@
   notify:
     - restart apache2
   when: ansible_pkg_mgr == 'yum'
+
+- name: start memcached
+  service: name=memcached state=started

provisioning/ansible/roles/mysql/tasks/main.yml

@@ -45,14 +45,17 @@
     - restart apache2
   when: ansible_pkg_mgr == 'yum'
 
-- name: db
+- name: start mysql
+  service: name={{ mysql_service }} state=started
+
+- name: mysql db
   mysql_db: name={{ item }} state=present
   with_items:
     - midas
     - midas_test
 
-- name: user
-  mysql_user: user=vagrant password=vagrant priv={{ item }}.*:ALL state=present
+- name: mysql user
+  mysql_user: user={{ ansible_env.SUDO_USER }} password={{ ansible_env.SUDO_USER }} priv={{ item }}.*:ALL state=present
   with_items:
     - midas
     - midas_test

provisioning/ansible/roles/php/tasks/main.yml

@@ -35,7 +35,9 @@
   yum: name={{ item }} state=present
   with_items:
     - php
+    - php-bcmath
     - php-gd
+    - php-pdo
     - php-pecl-xdebug
   notify:
     - restart apache2
@@ -62,8 +64,8 @@
 - name: curl getcomposer.org
   shell: curl https://getcomposer.org/installer | php chdir=/vagrant creates=/vagrant/composer.phar
 
-- name: mv composer.phar
-  command: mv /vagrant/composer.phar /usr/local/bin/composer creates=/usr/local/bin/composer
+- name: cp composer.phar
+  command: cp /vagrant/composer.phar /usr/local/bin/composer creates=/usr/local/bin/composer
 
 - name: chmod 0755 composer
   file: path=/usr/local/bin/composer mode=0755 state=file

provisioning/ansible/roles/postgresql/handlers/main.yml

@@ -0,0 +1,22 @@
+#=============================================================================
+# Midas Server
+# Copyright Kitware SAS, 26 rue Louis Guérin, 69100 Villeurbanne, France.
+# All rights reserved.
+# For more information visit http://www.kitware.com/.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0.txt
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+---
+- name: restart postgresql
+  service: name=postgresql state=restarted

provisioning/ansible/roles/postgresql/tasks/main.yml

@@ -38,15 +38,22 @@
     - restart apache2
   when: ansible_pkg_mgr == 'yum'
 
-- name: db
+- name: init postgresql
+  command: postgresql-setup initdb creates=/var/lib/pgsql/data/postgresql.conf
+  when: ansible_os_family == 'RedHat'
+
+- name: start postgresql
+  service: name=postgresql state=started
+
+- name: postgresql db
   postgresql_db: name={{ item }} state=present
   with_items:
     - midas
     - midas_test
   sudo_user: postgres
 
-- name: user
-  postgresql_user: db={{ item }} user=vagrant password=vagrant priv=ALL state=present
+- name: postgresql user
+  postgresql_user: db={{ item }} user={{ ansible_env.SUDO_USER }} password={{ ansible_env.SUDO_USER }} priv=ALL state=present
   with_items:
     - midas
     - midas_test