From 65be3c674e9fb9c996fa15c2ce0f150cdba2bffb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Br=C3=BCckl?= <andreas.brueckl@camadeus.at>
Date: Wed, 20 May 2015 17:37:18 +0200
Subject: [PATCH] nginx, config, translation2

---
 setup/ir.translation.csv                      |  6 ++++-
 setup/lib/config_at.py                        |  2 +-
 setup/puppet/modules/odoo/manifests/init.pp   | 25 ++++++++++++++++---
 .../modules/odoo/templates/odoo.nginx.erb     |  8 +++---
 setup/{restart_prod.sh => restart_server.sh}  |  0
 5 files changed, 31 insertions(+), 10 deletions(-)
 rename setup/{restart_prod.sh => restart_server.sh} (100%)

diff --git a/setup/ir.translation.csv b/setup/ir.translation.csv
index 32e13172..02ff3632 100644
--- a/setup/ir.translation.csv
+++ b/setup/ir.translation.csv
@@ -1 +1,5 @@
-lang,type,name,res_id,src,value
+"lang","type","name","res_id","src","value"
+"de_DE","object","ir.actions.report.xml,name",,"Picking","Lieferschein"
+"de_DE","model","ir.ui.menu,name","base.menu_purchase_root","Purchases","Einkauf"
+"de_DE","model","ir.ui.menu,name","base.menu_procurement_management_supplier_name","Suppliers","Lieferanten"
+"de_DE","model","ir.actions.report.xml,name","stock.action_report_picking","Pickauftrag","Lieferschein"
diff --git a/setup/lib/config_at.py b/setup/lib/config_at.py
index a638b583..9f56c80c 100644
--- a/setup/lib/config_at.py
+++ b/setup/lib/config_at.py
@@ -107,7 +107,7 @@ class Config():
             'group_stock_packaging': False,              # Ermöglicht die Auswahl einer Verpackung            
         }  
 
-        self.removal_strategy = 'fefo'                      #[fifo], [lifo], [fefo]
+        #self.removal_strategy = 'fefo'                      #[fifo], [lifo], [fefo]
         
         self.stock_cost_method = 'average'               # [standard], [average], [real] 
 
diff --git a/setup/puppet/modules/odoo/manifests/init.pp b/setup/puppet/modules/odoo/manifests/init.pp
index c4a0f5e5..ac1f0d76 100644
--- a/setup/puppet/modules/odoo/manifests/init.pp
+++ b/setup/puppet/modules/odoo/manifests/init.pp
@@ -42,7 +42,7 @@ class odoo {
     # 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.1 main ; pg_createcluster --start --locale en_US.UTF-8 9.1 main',
+       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'],
@@ -177,7 +177,24 @@ class odoo {
         ensure  => present,
         content => template('odoo/default.nginx.erb'),
         notify => Package['nginx'],
-    } 	  
+    } 	 
+    
+	# NGINX SSL
+  	file { "/etc/nginx/ssl":
+      	owner => 'www-data',
+      	group => 'www-data',
+      	mode  => '0700',
+		ensure => "directory",
+		require => Package['nginx'],
+		notify => Service['nginx'],
+  	}	   
+  	
+  	# Delete Default Server
+  	file { "/etc/nginx/sites-enabled/default":
+		ensure => "absent",
+		require => Package['nginx'],
+		notify => Service['nginx'],
+  	}  	  	  
 }
 
 define odoo::instance ($db_pw,$ssl = false, $servername, $odooport, $odooport_longpolling) {
@@ -374,14 +391,14 @@ git --work-tree=/home/$instance/ext --git-dir=/home/$instance/ext.git checkout -
         
     if str2bool("$ssl") {
         $key_file_test = "test -e /etc/nginx/ssl/$instance.key"
-        $key_file_cmd = "sudo openssl req -x509 -nodes -days 3650 -newkey rsa:2048 -keyout /etc/nginx/ssl/$instance.key -out /etc/nginx/ssl/$instance.crt -subj \"/C=AT/ST=Vienna/L=Vienna/O= Security/OU=IT Department/CN=dummy\""
+        $key_file_cmd = "sudo openssl req -x509 -nodes -days 3650 -newkey rsa:2048 -keyout /etc/nginx/ssl/$instance.key -out /etc/nginx/ssl/$instance.crt -subj \"/C=AT/ST=Vienna/L=Vienna/O=Security/OU=IT-Department/CN=dummy\""
         $certname = "ssl_cert_$instance"
         exec { $certname:
             command => $key_file_cmd,
             unless  => $key_file_test,
             path    => ['/bin', '/sbin', '/usr/bin', '/usr/sbin'],
             notify => Service['nginx'],
-            require => Package[nginx],
+            require => [Package[nginx], File['/etc/nginx/ssl']],
         }        
     }
 
diff --git a/setup/puppet/modules/odoo/templates/odoo.nginx.erb b/setup/puppet/modules/odoo/templates/odoo.nginx.erb
index 3cb8a0df..241243d4 100644
--- a/setup/puppet/modules/odoo/templates/odoo.nginx.erb
+++ b/setup/puppet/modules/odoo/templates/odoo.nginx.erb
@@ -1,4 +1,4 @@
-<% if ssl == true %>   
+<% if @ssl == true %>   
 server {
     listen         80;
     server_name   <%= @servername %>;
@@ -12,7 +12,7 @@ upstream odoo-server-<%= @instance %> {
 }
 
 server {
-		<% if ssl == true %>   
+		<% if @ssl == true %>   
     listen 443 ssl;
 		<% else %>
 		listen      80;
@@ -32,12 +32,12 @@ server {
     proxy_buffers 16 64k;
     proxy_buffer_size 128k;
 
-	<% if ssl == true %>
+	<% if @ssl == true %>
     # SSL config
     ssl_protocols       SSLv3 TLSv1 TLSv1.1 TLSv1.2;
     ssl_ciphers         HIGH:!aNULL:!MD5;	
     
-	   <% if servername =~ /.*camadeus.at$/ %>
+	   <% if @servername =~ /.*camadeus.at$/ %>
     ssl_certificate     /etc/nginx/ssl/camadeus.at.crt;
     ssl_certificate_key /etc/nginx/ssl/camadeus.at.key;	      
 	   <% else %>
diff --git a/setup/restart_prod.sh b/setup/restart_server.sh
similarity index 100%
rename from setup/restart_prod.sh
rename to setup/restart_server.sh