[FEATURE] Xenial compatibility

attributes/default.rb

@@ -12,12 +12,18 @@ default['typo3_site']['repository'] = ''
 default['typo3_site']['repository_hostname'] = ''
 default['typo3_site']['repository_port'] = 22
 default['typo3_site']['download_typo3'] = false
-default['typo3_site']['typo3_version'] = '6.2'
-default['typo3_site']['mysql_version'] = '5.6'
+default['typo3_site']['typo3_version'] = '7.6'
 default['typo3_site']['deploy_dump'] = '~/site/dump.sql'
 
+version = String(`awk '/DISTRIB_RELEASE=/' /etc/lsb-release | sed 's/DISTRIB_RELEASE=//' | sed 's/[.]/./' | tr -d '\n'`)
+if version == '16.04'
+	default['typo3_site']['mysql_version'] = '5.7'
+else
+	default['typo3_site']['mysql_version'] = '5.6'
+end
+
 default['typo3_site']['solr']['init'] = false
-default['typo3_site']['solr']['version_solr'] = '4.8.1' # latest support solr version of the TYPO3 extension
+default['typo3_site']['solr']['version_solr'] = '4.8.1' # latest supported solr version of the TYPO3 extension
 default['typo3_site']['solr']['version_extension'] = '3.0' # branch of the TYPO3 extension
 default['typo3_site']['solr']['version_plugin_access'] = '2.0' # access plugin of the TYPO3 extension
 default['typo3_site']['solr']['version_plugin_utils'] = '1.2' # access plugin of the TYPO3 extension

metadata.rb

@@ -9,13 +9,13 @@ recipe 'typo3_site::default', 'Main recipe'
 issues_url 'https://gitlab.sgalinski.de/chef-cookbooks/typo3_site/issues'
 source_url 'https://gitlab.sgalinski.de/chef-cookbooks/typo3_site'
 
-depends 'apache2', '~> 3.2.2'
+depends 'apache2', '<= 3.2.1'
 depends 'database', '~> 5.1.2'
 depends 'graphicsmagick'
 depends 'hostsfile'
 depends 'java'
 depends 'line'
-depends 'mysql', '~> 8.0.1'
+depends 'mysql', '~> 7.2.0'
 depends 'mysql2_chef_gem', '~> 1.1.0'
 depends 'typo3_solr'
 depends 'ubuntu_base'
\ No newline at end of file

recipes/default.rb

@@ -23,6 +23,7 @@
 # THE SOFTWARE.
 
 data_bag = data_bag_item('apps', 'global')
+version = String(`awk '/DISTRIB_RELEASE=/' /etc/lsb-release | sed 's/DISTRIB_RELEASE=//' | sed 's/[.]/./' | tr -d '\n'`)
 
 ##########################
 ### Add hostname entry ###
@@ -44,71 +45,136 @@ end
 
 include_recipe 'graphicsmagick'
 include_recipe 'apache2'
-include_recipe 'apache2::mod_php5'
 include_recipe 'apache2::mod_ssl'
 
-%w(php5-curl php5-intl php5-gd php5-mcrypt php5-mysql php5-imagick).each do |name|
-	package name do
-		action :install
+if version == '16.04'
+	include_recipe 'apache2::mod_fcgid'
+	%w(php php-cli php-curl php-intl php-gd php-mcrypt php-mysql ).each do |name|
+		package name do
+			action :install
+		end
+	end
+else
+	include_recipe 'apache2::mod_php5'
+	%w(php5-curl php5-intl php5-gd php5-mcrypt php5-mysql php5-imagick).each do |name|
+		package name do
+			action :install
+		end
 	end
 end
 
 ################################
-### Modify Php Configuration ###
+### Modify PHP Configuration ###
 ################################
 
-replace_or_add 'Increase time limit' do
-	path '/etc/php5/apache2/php.ini'
-	pattern 'max_execution_time =.*'
-	line 'max_execution_time = 240'
-end
+if version == '16.04'
+	replace_or_add 'Increase time limit' do
+		path '/etc/php/7.0/fpm/php.ini'
+		pattern 'max_execution_time =.*'
+		line 'max_execution_time = 240'
+	end
 
-replace_or_add 'Increase time limit - CLI' do
-	path '/etc/php5/cli/php.ini'
-	pattern 'max_execution_time =.*'
-	line 'max_execution_time = 240'
-end
+	replace_or_add 'Increase time limit - CLI' do
+		path '/etc/php/7.0/cli/php.ini'
+		pattern 'max_execution_time =.*'
+		line 'max_execution_time = 240'
+	end
 
-replace_or_add 'Increase memory limit' do
-	path '/etc/php5/apache2/php.ini'
-	pattern 'memory_limit =.*'
-	line 'memory_limit = 256M'
-end
+	replace_or_add 'Increase memory limit' do
+		path '/etc/php/7.0/fpm/php.ini'
+		pattern 'memory_limit =.*'
+		line 'memory_limit = 256M'
+	end
 
-replace_or_add 'Increase upload size limit' do
-	path '/etc/php5/apache2/php.ini'
-	pattern 'upload_max_filesize =.*'
-	line 'upload_max_filesize = 10M'
-end
+	replace_or_add 'Increase upload size limit' do
+		path '/etc/php/7.0/fpm/php.ini'
+		pattern 'upload_max_filesize =.*'
+		line 'upload_max_filesize = 10M'
+	end
 
-replace_or_add 'Increase upload size limit - CLI' do
-	path '/etc/php5/cli/php.ini'
-	pattern 'upload_max_filesize =.*'
-	line 'upload_max_filesize = 10M'
-end
+	replace_or_add 'Increase upload size limit - CLI' do
+		path '/etc/php/7.0/cli/php.ini'
+		pattern 'upload_max_filesize =.*'
+		line 'upload_max_filesize = 10M'
+	end
 
-replace_or_add 'Increase post_max_size limit' do
-	path '/etc/php5/apache2/php.ini'
-	pattern 'post_max_size =.*'
-	line 'post_max_size = 10M'
-end
+	replace_or_add 'Increase post_max_size limit' do
+		path '/etc/php/7.0/fpm/php.ini'
+		pattern 'post_max_size =.*'
+		line 'post_max_size = 10M'
+	end
 
-replace_or_add 'Increase post_max_size limit - CLI' do
-	path '/etc/php5/cli/php.ini'
-	pattern 'post_max_size =.*'
-	line 'post_max_size = 10M'
-end
+	replace_or_add 'Increase post_max_size limit - CLI' do
+		path '/etc/php/7.0/cli/php.ini'
+		pattern 'post_max_size =.*'
+		line 'post_max_size = 10M'
+	end
 
-replace_or_add 'Set date.timezone' do
-	path '/etc/php5/apache2/php.ini'
-	pattern 'date.timezone =.*'
-	line 'date.timezone = Europe/Berlin'
-end
+	replace_or_add 'Set date.timezone' do
+		path '/etc/php/7.0/fpm/php.ini'
+		pattern 'date.timezone =.*'
+		line 'date.timezone = Europe/Berlin'
+	end
 
-replace_or_add 'date.timezone - CLI' do
-	path '/etc/php5/cli/php.ini'
-	pattern 'date.timezone =.*'
-	line 'date.timezone = Europe/Berlin'
+	replace_or_add 'date.timezone - CLI' do
+		path '/etc/php/7.0/cli/php.ini'
+		pattern 'date.timezone =.*'
+		line 'date.timezone = Europe/Berlin'
+	end
+else
+	replace_or_add 'Increase time limit' do
+		path '/etc/php5/apache2/php.ini'
+		pattern 'max_execution_time =.*'
+		line 'max_execution_time = 240'
+	end
+
+	replace_or_add 'Increase time limit - CLI' do
+		path '/etc/php5/cli/php.ini'
+		pattern 'max_execution_time =.*'
+		line 'max_execution_time = 240'
+	end
+
+	replace_or_add 'Increase memory limit' do
+		path '/etc/php5/apache2/php.ini'
+		pattern 'memory_limit =.*'
+		line 'memory_limit = 256M'
+	end
+
+	replace_or_add 'Increase upload size limit' do
+		path '/etc/php5/apache2/php.ini'
+		pattern 'upload_max_filesize =.*'
+		line 'upload_max_filesize = 10M'
+	end
+
+	replace_or_add 'Increase upload size limit - CLI' do
+		path '/etc/php5/cli/php.ini'
+		pattern 'upload_max_filesize =.*'
+		line 'upload_max_filesize = 10M'
+	end
+
+	replace_or_add 'Increase post_max_size limit' do
+		path '/etc/php5/apache2/php.ini'
+		pattern 'post_max_size =.*'
+		line 'post_max_size = 10M'
+	end
+
+	replace_or_add 'Increase post_max_size limit - CLI' do
+		path '/etc/php5/cli/php.ini'
+		pattern 'post_max_size =.*'
+		line 'post_max_size = 10M'
+	end
+
+	replace_or_add 'Set date.timezone' do
+		path '/etc/php5/apache2/php.ini'
+		pattern 'date.timezone =.*'
+		line 'date.timezone = Europe/Berlin'
+	end
+
+	replace_or_add 'date.timezone - CLI' do
+		path '/etc/php5/cli/php.ini'
+		pattern 'date.timezone =.*'
+		line 'date.timezone = Europe/Berlin'
+	end
 end
 
 ################################

templates/default/my-5.7.cnf.erb

+[mysqld]
+# disable the strict mode
+sql-mode=""
+
+key_buffer_size = 32M
+
+max_allowed_packet  = 16M
+max_connections     = 214
+thread_cache_size   = 200
+
+query_cache_limit   = 4M
+query_cache_size    = 128M
+query_cache_type    = 1
+
+tmp_table_size          = 128M
+max_heap_table_size     = 128M
+
+table_definition_cache  = 800
+join_buffer_size        = 4M
+
+table_open_cache = 200
+open_files_limit = 512
+
+#myisam-recover         = BACKUP
+myisam_sort_buffer_size = 32M
+myisam_recover_options = BACKUP
+
+innodb_buffer_pool_size   = 512M
+innodb_flush_method = O_DIRECT
+innodb_thread_concurrency = 0
+innodb_read_io_threads = 64
+innodb_write_io_threads = 64
+
+log_warnings = 2
+slave_net_timeout = 60
+
+collation_server = utf8_unicode_ci
+character_set_server = utf8
+
+long_query_time = 3
+slow_query_log = 1
+slow_query_log_file = /var/log/mysql-default/log-slow-queries.log
+
+[mysqldump]
+quick
+quote-names
+max_allowed_packet	= 128M
+
+[isamchk]
+key_buffer		= 32M
+
+[mysql]
+default-character-set=utf8