From 4fff03330994848130300901cb3bbd272216881a Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@softwarelivre.org>
Date: Thu, 26 Feb 2015 16:48:49 -0300
Subject: [PATCH] colab: split database configuration into its own file

---
 cookbooks/colab/recipes/default.rb             | 7 +++++++
 cookbooks/colab/templates/00-database.yaml.erb | 6 ++++++
 cookbooks/colab/templates/settings.yaml.erb    | 6 ------
 3 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 cookbooks/colab/templates/00-database.yaml.erb

diff --git a/cookbooks/colab/recipes/default.rb b/cookbooks/colab/recipes/default.rb
index aac2f82..4c92388 100644
--- a/cookbooks/colab/recipes/default.rb
+++ b/cookbooks/colab/recipes/default.rb
@@ -27,6 +27,13 @@ template '/etc/colab/settings.yaml' do
   notifies :restart, 'service[colab]'
 end
 
+template '/etc/colab/settings.d/00-database.yaml' do
+  owner  'root'
+  group  'colab'
+  mode   0640
+  notifies :restart, 'service[colab]'
+end
+
 cookbook_file '/usr/lib/colab/lib/python2.7/site-packages/colab/static/img/logo.svg' do
   owner 'root'
   group 'root'
diff --git a/cookbooks/colab/templates/00-database.yaml.erb b/cookbooks/colab/templates/00-database.yaml.erb
new file mode 100644
index 0000000..c6a97d8
--- /dev/null
+++ b/cookbooks/colab/templates/00-database.yaml.erb
@@ -0,0 +1,6 @@
+DATABASES:
+  default:
+    ENGINE: django.db.backends.postgresql_psycopg2
+    NAME: colab
+    USER: colab
+    HOST: <%= node['peers']['database'] %>
diff --git a/cookbooks/colab/templates/settings.yaml.erb b/cookbooks/colab/templates/settings.yaml.erb
index faf2935..90b1298 100644
--- a/cookbooks/colab/templates/settings.yaml.erb
+++ b/cookbooks/colab/templates/settings.yaml.erb
@@ -1,9 +1,3 @@
-DATABASES:
-  default:
-    ENGINE: django.db.backends.postgresql_psycopg2
-    NAME: colab
-    USER: colab
-    HOST: <%= node['peers']['database'] %>
 
 ## Set to false in production
 DEBUG: false
--
libgit2 0.21.2