From 18bdd33be0e605e0723a45aa7359887873313c8f Mon Sep 17 00:00:00 2001
From: Paulo Tada <paulohtfs@gmail.com>
Date: Mon, 14 Sep 2015 17:16:19 -0300
Subject: [PATCH] Renaming colab 04-settings.py.erb

---
 cookbooks/colab/templates/04-custom_settings.py.erb | 41 +++++++++++++++++++++++++++++++++++++++++
 cookbooks/colab/templates/04-settings.py.erb        | 41 -----------------------------------------
 2 files changed, 41 insertions(+), 41 deletions(-)
 create mode 100644 cookbooks/colab/templates/04-custom_settings.py.erb
 delete mode 100644 cookbooks/colab/templates/04-settings.py.erb

diff --git a/cookbooks/colab/templates/04-custom_settings.py.erb b/cookbooks/colab/templates/04-custom_settings.py.erb
new file mode 100644
index 0000000..07e7b18
--- /dev/null
+++ b/cookbooks/colab/templates/04-custom_settings.py.erb
@@ -0,0 +1,41 @@
+## Set to false in production
+DEBUG = False
+TEMPLATE_DEBUG = False
+
+## System admins
+ADMINS = [
+<%- node['config']['admins'].each do |admin| %>
+    [
+        <%- admin.each do |item| %>
+            "<%= item %>",
+        <%- end %>
+    ],
+<% end %>
+]
+
+MANAGERS = ADMINS
+
+# general Django settings
+DEFAULT_FROM_EMAIL = '<%= node['config']['colab_from_address'] %>'
+
+# colab-specific
+COLAB_FROM_ADDRESS = '<%= node['config']['colab_from_address'] %>'
+SERVER_EMAIL = '<%= node['config']['server_email'] %>'
+
+EMAIL_HOST = "localhost"
+EMAIL_PORT =  25
+EMAIL_SUBJECT_PREFIX = "<%= node['config']['email_subject_prefix'] %>"
+
+SECRET_KEY = "<%= File.read('/etc/colab/secret.key').strip %>"
+
+SITE_URL = "<%= node['config']['site_url'] %>"
+
+ALLOWED_HOSTS = ["<%= node['config']['external_hostname'] %>"]
+
+## Disable indexing
+ROBOTS_NOINDEX = False
+
+## Set URL of Colab home
+COLAB_HOME_URL = '/social'
+
+GOOGLE_ANALYTICS_TRACKING_ID = "<%= node['config']['google_analytics_id'] %>"
diff --git a/cookbooks/colab/templates/04-settings.py.erb b/cookbooks/colab/templates/04-settings.py.erb
deleted file mode 100644
index 5e84f14..0000000
--- a/cookbooks/colab/templates/04-settings.py.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-## Set to false in production
-DEBUG = False
-TEMPLATE_DEBUG = False
-
-## System admins
-ADMINS = [
-<%- node['config']['admins'].each do |admin| %>
-    [
-        <%- admin.each do |item| %>
-            "<%= item %>",
-        <%- end %>
-    ],
-<% end %>
-]
-
-MANAGERS = ADMINS
-
-# general Django settings
-DEFAULT_FROM_EMAIL = "<%= node['config']['colab_from_address'] %>"
-
-# colab-specific
-COLAB_FROM_ADDRESS = "<%= node['config']['colab_from_address'] %>"
-SERVER_EMAIL = "<%= node['config']['server_email'] %>"
-
-EMAIL_HOST = "localhost"
-EMAIL_PORT =  25
-EMAIL_SUBJECT_PREFIX = "<%= node['config']['email_subject_prefix'] %>"
-
-SECRET_KEY = "<%= File.read('/etc/colab/secret.key').strip %>"
-
-SITE_URL = "<%= node['config']['site_url'] %>"
-
-ALLOWED_HOSTS = ["<%= node['config']['external_hostname'] %>"]
-
-## Disable indexing
-ROBOTS_NOINDEX = False
-
-## Set URL of Colab home
-COLAB_HOME_URL = '/social'
-
-GOOGLE_ANALYTICS_TRACKING_ID = "<%= node['config']['google_analytics_id'] %>"
--
libgit2 0.21.2