Updaten init.pp

.gitignore

@@ -2,3 +2,4 @@
 .project
 .pydevproject
 .settings
+.idea

dev/odoo-server-dev-sk.conf

@@ -4,7 +4,7 @@ xmlrpc_port = 8080
 ; This is the password that allows database operations:
 ; admin_passwd = admin
 db_host = False
-db_port = 5433
+db_port = 5432
 db_user = False
 db_password = False
 

setup/puppet/modules/odoo/manifests/init.pp

@@ -44,14 +44,14 @@ class odoo {
         encoding => 'UTF8',
     }
 
-    # workaround for http://projects.puppetlabs.com/issues/4695
-    # when PostgreSQL is installed with SQL_ASCII encoding instead of UTF8
-    exec { 'utf8 postgres':
-       command => 'sudo -u postgres pg_dropcluster --stop 9.3 main ; pg_createcluster --start --locale en_US.UTF-8 9.3 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'],
-    }
+#    # workaround for http://projects.puppetlabs.com/issues/4695
+#    # when PostgreSQL is installed with SQL_ASCII encoding instead of UTF8
+#    exec { 'utf8 postgres':
+#       command => 'sudo -u postgres pg_dropcluster --stop 9.3 main ; pg_createcluster --start --locale en_US.UTF-8 9.3 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'],
+#    }
 
   file { "/var/log/odoo":
       owner => 'root',
@@ -115,19 +115,19 @@ class odoo {
     }
 
 
-	file { 'wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb':
-		name => "/tmp/wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb",
-		owner => root,
-		group => root,
-		source => "puppet:///modules/odoo/wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb"
-	}
+#	file { 'wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb':
+#		name => "/tmp/wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb",
+#		owner => root,
+#		group => root,
+#		source => "puppet:///modules/odoo/wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb"
+#	}
 	
-    package { 'wkhtmltox':
-    	provider => dpkg,
-        ensure => installed,
-        source => "/tmp/wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb",
-        require => [File['wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb'],Package['xfonts-base']],
-    }
+#    package { 'wkhtmltox':
+#    	provider => dpkg,
+#        ensure => installed,
+#        source => "/tmp/wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb",
+#        require => [File['wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb'],Package['xfonts-base']],
+#    }
 
     package {['passlib',
               'psycogreen',