Enhance nodo::role::dev::drupal8

diff --git a/manifests/role/dev/drupal8.pp b/manifests/role/dev/drupal8.pp
index 6196f5c91bf1b452e0015800164a1df5e974076a..9d678e26533b86d64f20bed34ca48fa8667ef75b 100644 (file)
--- a/manifests/role/dev/drupal8.pp
+++ b/manifests/role/dev/drupal8.pp
@@ -18,6 +18,8 @@ class nodo::role::dev::drupal8(
     manage_mod_php => '7',
   }
 
+  $php_version = $::php::params::version7
+
   include database
   include drupal
 
@@ -36,7 +38,7 @@ class nodo::role::dev::drupal8(
   #file { '/etc/php5/apache2/conf.d/20-xdebug-levels.ini':
   #file { '/etc/php/5.6/apache2/conf.d/20-xdebug-levels.ini':
   #file { '/etc/php/7.0/apache2/conf.d/20-xdebug-levels.ini':
-  file { '/etc/php/7.2/mods-available/20-xdebug-levels.ini':
+  file { "/etc/php/${php_version}/apache2/conf.d/20-xdebug-levels.ini":
     ensure  => present,
     owner   => 'root',
     group   => 'root',
@@ -46,6 +48,31 @@ class nodo::role::dev::drupal8(
     notify  => Service['apache2'],
   }
 
+  # Fix previous typo error
+  file { [ '/etc/php/7.2/mods-available/20-xdebug-levels.ini' ]:
+    ensure => absent,
+  }
+
+  #file { "/etc/php/${php_version}/apache2/conf.d/20-max-execution-time.ini":
+  #  ensure  => present,
+  #  owner   => 'root',
+  #  group   => 'root',
+  #  mode    => '0644',
+  #  content => "max_execution_time=120\n",
+  #  require => Package['php'],
+  #  notify  => Service['apache2'],
+  #}
+
+  #file { "/etc/php/${php_version}/apache2/conf.d/20-memory-limit.ini":
+  #  ensure  => present,
+  #  owner   => 'root',
+  #  group   => 'root',
+  #  mode    => '0644',
+  #  content => "memory_limit=512M\n",
+  #  require => Package['php'],
+  #  notify  => Service['apache2'],
+  #}
+
   # Do not use this password on production machines
   database::instance { $db_name:
     password => $db_password,