have puppet generated config in seperate config dir
authorCornelius Weiß <mail@corneliusweiss.de>
Tue, 21 Jan 2014 09:12:38 +0000 (10:12 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 21 Jan 2014 13:56:50 +0000 (14:56 +0100)
- don't overwrite existing once
- allow multi domain

Change-Id: I4c7eac69a34b08429ba0566bdf2eff9ac8bb7bd5
Reviewed-on: https://gerrit.tine20.org/tine20/2748
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
scripts/vagrant/puphpet/files/dot/apache.conf
scripts/vagrant/puphpet/puppet/manifests/default.pp

index a216041..00aebd6 100644 (file)
@@ -21,7 +21,7 @@ Alias /Microsoft-Server-ActiveSync /www/tine.vagrant/htdocs/Microsoft-Server-Act
 
     <IfModule mod_php5.c>
         php_admin_value max_input_time          120
-        php_admin_value include_path            .:/www/tine.vagrant/htdocs:/www/tine.vagrant/htdocs/library:/etc/tine20
+        php_admin_value include_path            .:/www/tine.vagrant/htdocs:/www/tine.vagrant/htdocs/library:/www/tine.vagrant/conf
         #php_admin_value open_basedir            /www/tine.vagrant/htdocs:/var/lib/tine20:/tmp:/usr/share/php:/etc/tine20:/var/log/tine20
         php_admin_value session.gc_maxlifetime  86400
         php_admin_value memory_limit            128M
index 4cabab4..31c3f14 100644 (file)
@@ -744,7 +744,7 @@ if has_key($beanstalkd_values, 'install') and $beanstalkd_values['install'] == 1
 # tine20 manifest
 
 # /www/tine.vagrant logs userdata files htdocs
-file { ["/www", "/www/tine.vagrant"]:
+file { ["/www", "/www/tine.vagrant", "/www/tine.vagrant/conf"]:
     ensure => directory,
     owner  => $::ssh_username,
     mode    => 0775,
@@ -777,7 +777,7 @@ mysql::db { $tine20_values['database']['name']:
 }
   
 file { "config.inc.php":
-  path    => "/usr/local/share/tine20.git/tine20/config.inc.php",
+  path    => "/www/tine.vagrant/conf/config.inc.php",
   ensure  => present,
   owner   => 'root',
   group   => 'root',
@@ -819,7 +819,7 @@ composer::exec { 'tine20-composer-run':
  
 # phing install
 file { "install.properties":
-  path    => "/usr/local/share/tine20.git/tine20/install.properties",
+  path    => "/www/tine.vagrant/conf/install.properties",
   ensure  => present,
   owner   => 'root',
   group   => 'root',
@@ -835,8 +835,8 @@ adminEmailAddress=${tine20_values['initialuser']['email']}
 
 exec { 'phing-tine-install':
   cwd     => "/usr/local/share/tine20.git/tine20/",
-  command => "sudo sudo -u www-data /usr/local/share/tine20.git/tine20/vendor/bin/phing tine-install",
+  command => "sudo sudo -u www-data /usr/local/share/tine20.git/tine20/vendor/bin/phing -D configdir=/www/tine.vagrant/conf/ tine-install",
   require => [
-    File['/usr/local/share/tine20.git/tine20/install.properties']
+    File['/www/tine.vagrant/conf/install.properties']
   ]
 }
\ No newline at end of file