puppet & script updates

bin/foreman_server.sh

@@ -61,9 +61,7 @@ EOF
 cp ../config/dbmigrate $FOREMAN_DIR/extras/
 # fix broken passenger config file for scl
 cp ../config/broker-ruby $FOREMAN_DIR
-chmod 777 $FOREMAN_DIR/broker-ruby
-cp ../config/ruby193-passenger.conf /etc/httpd/conf.d/ruby193-passenger.conf
-rm /etc/httpd/conf.d/passenger.conf
+chmod 775 $FOREMAN_DIR/broker-ruby
 
 pushd $FOREMAN_INSTALLER_DIR
 cat > installer.pp << EOM
@@ -95,16 +93,17 @@ popd
 echo '*' >> $SCL_RUBY_HOME/etc/puppet/autosign.conf
 
 scl enable ruby193 "ruby foreman-setup.rb proxy"
+scl enable ruby193 "ruby foreman-setup.rb hostgroups"
 
 # Configure class defaults
 # This is not ideal, but will work until the API v2 is ready
 
-PASSWD_COUNT=$(cat ../puppet/trystack/manifests/params.pp | grep CHANGEME | wc -l)
+PASSWD_COUNT=$(cat ../puppet/modules/trystack/manifests/params.pp | grep CHANGEME | wc -l)
 
 for i in $(seq $PASSWD_COUNT)
 do
  export PASSWD=$(scl enable ruby193 "ruby foreman-setup.rb password")
- sed -i "/CHANGEME/ {s/CHANGEME/$PASSWD/;:a;n;ba}" ../puppet/trystack/manifests/params.pp
+ sed -i "/CHANGEME/ {s/CHANGEME/$PASSWD/;:a;n;ba}" ../puppet/modules/trystack/manifests/params.pp
 done
 
 # install puppet modules
@@ -119,7 +118,6 @@ sudo -u foreman scl enable ruby193 "cd $FOREMAN_DIR; RAILS_ENV=production rake p
 
 sed -i "s/foreman_hostname/$PUPPETMASTER/" foreman-params.json
 
-scl enable ruby193 "ruby foreman-setup.rb hostgroups"
 # write client-register-to-foreman script
 # TODO don't hit yum unless packages are not installed
 cat >/tmp/foreman_client.sh <<EOF

installer_puppet/passenger/manifests/install.pp

@@ -10,4 +10,15 @@
  fail("${::hostname}: This module does not support operatingsystem ${::osfamily}")
  }
  }
+ file { "${apache::params::configdir}/ruby193-passenger.conf":
+ ensure => $ensure,
+ mode => '0644',
+ require => Package['httpd'],
+ notify => Exec['reload-apache'],
+ content => template('passenger/ruby193-passenger.conf.erb'),
+ }
+
+ file { "${apache::params::configdir}/passenger.conf":
+ ensure => absent,
+ }
 }

installer_puppet/puppet/manifests/server/config.pp

@@ -48,7 +48,7 @@
 
  exec {'puppet_server_config-generate_ca_cert':
  creates => $::puppet::server::ssl_cert,
- command => "${puppet::params::puppetca_path}/${puppet::params::puppetca_bin} --generate ${::fqdn}",
+ command => "/usr/bin/scl enable ruby193 '${puppet::params::puppetca_path}/${puppet::params::puppetca_bin} --generate ${::fqdn}'",
  require => File["${puppet::server::dir}/puppet.conf"],
  notify => Service[$puppet::server::httpd_service],
  }