alleged fix for some of the postgresql problems

Author: tkowark

Diff for: Vagrantfile

@@ -4,13 +4,14 @@
 Vagrant.configure("2") do |config|
   config.vm.box = "precise32"
   config.vm.box_url = "http://files.vagrantup.com/precise32.box"
-  config.vm.provision :shell, :path => "bootstrap.sh"
   config.vm.provision :puppet do |puppet|
     puppet.manifests_path = "puppet/manifests"
     puppet.module_path    = "puppet/modules"
     puppet.manifest_file  = "development.pp"
   end
 
+  config.vm.provision :shell, :path => "bootstrap.sh"  
+  
   # port forward
   config.vm.network :forwarded_port, host: 3000, guest: 3000
   config.vm.synced_folder ".", "/home/vagrant/hpi-hiwi-portal"  

Diff for: bootstrap.sh

@@ -1,2 +1,13 @@
+# postgres
+export LANGUAGE="en_US.UTF-8"
+export LANG="en_US.UTF-8"
+export LC_ALL="en_US.UTF-8"
+apt-get -y install postgresql
+apt-get -y install libpq-dev
+
+# init db
+sudo -u postgres createuser --superuser ror_su
+sudo -u postgres psql -c "ALTER USER ror_su WITH PASSWORD 'us_ror'"
+
 # copy the database.yml file
 cp /vagrant/config/database.yml.default /vagrant/config/database.yml

Diff for: db/schema.rb

@@ -13,9 +13,6 @@
 
 ActiveRecord::Schema.define(version: 20130819123905) do
 
-  # These are extensions that must be enabled in order to support this database
-  enable_extension "plpgsql"
-
   create_table "job_offers", force: true do |t|
     t.string   "description"
     t.string   "title"

Diff for: puppet/manifests/development.pp

@@ -27,37 +27,9 @@
   }
 }
 
-class prepare_postgres {
-
-  include postgresql::server
-  
-  postgresql::pg_hba_rule { 'allow postgres user to access any database':
-      description => 'allow postgres user to access any database',
-      type => 'local',
-      database => 'all',
-      user => 'postgres',
-      auth_method => 'ident',
-      order => '000',
-  }
-
-  postgresql::database_user{ 'ror_su':
-    password_hash => postgresql_password('ror_su', 'us_ror'),
-    superuser => true,
-    require => Class['postgresql::server'],
-  }
-  
-  exec { 'utf8 postgres':
-    command => 'pg_dropcluster --stop 9.1 main ; pg_createcluster --start --locale en_US.UTF-8 9.1 main',
-    unless  => 'sudo -u postgres psql -t -c "\l" | grep template1 | grep -q UTF',
-    require => Class['postgresql::server'],
-    path    => ['/bin', '/sbin', '/usr/bin', '/usr/sbin'],
-  }
-}
-
 class doinstall {
   include preparation
   include installrvm
-  include prepare_postgres
 }
 
 include doinstall