split out sql template into its own recipe, disable by default to mat…

…ch ldap
gleamicus · Jun 22, 2015 · 13c78ab · 13c78ab
1 parent f10b169
commit 13c78ab
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -55,7 +55,7 @@
 default['freeradius']['local_secret'] = "testing1234"
 default['freeradius']['enable_remote_clients'] = true
 default['freeradius']['remote_secret'] = "remote1234"
-default['freeradius']['enable_sql'] = true
+default['freeradius']['enable_sql'] = false
 
 # Client File Config
 default['freeradius']['clients'] = {

diff --git a/recipes/default.rb b/recipes/default.rb
@@ -12,44 +12,40 @@
   include_recipe 'freeradius::ldap'
 end
 
-template "#{node['freeradius']['dir']}/sql.conf" do
-  source "sql.conf.erb"
-  owner node['freeradius']['user']
-  group node['freeradius']['group']
-  mode 0600
-  notifies :restart, "service[#{node['freeradius']['service']}]", :immediately
+if node['freeradius']['enable_sql'] == true
+  include_recipe 'freeradius::sql'
 end
 
 template "#{node['freeradius']['dir']}/clients.conf" do
   source "clients.conf.erb"
   owner node['freeradius']['user']
   group node['freeradius']['group']
   mode 0600
-  notifies :restart, "service[#{node['freeradius']['service']}]", :immediately
+  notifies :restart, "service[#{node['freeradius']['service']}]"
 end
 
 template "#{node['freeradius']['dir']}/radiusd.conf" do
   source "radiusd.conf.erb"
   owner node['freeradius']['user']
   group node['freeradius']['group']
   mode 0600
-  notifies :restart, "service[#{node['freeradius']['service']}]", :immediately
+  notifies :restart, "service[#{node['freeradius']['service']}]"
 end
 
 template "#{node['freeradius']['dir']}/sites-available/default" do
   source "default.erb"
   owner node['freeradius']['user']
   group node['freeradius']['group']
   mode 0600
-  notifies :restart, "service[#{node['freeradius']['service']}]", :immediately
+  notifies :restart, "service[#{node['freeradius']['service']}]"
 end
 
 template "#{node['freeradius']['dir']}/sites-available/inner-tunnel" do
   source "inner-tunnel.erb"
   owner node['freeradius']['user']
   group node['freeradius']['group']
   mode 0600
-  notifies :restart, "service[#{node['freeradius']['service']}]", :immediately
+  notifies :restart, "service[#{node['freeradius']['service']}]"
 end
 
 service node['freeradius']['service'] do

diff --git a/recipes/sql.rb b/recipes/sql.rb
@@ -0,0 +1,7 @@
+template "#{node['freeradius']['dir']}/sql.conf" do
+  source "sql.conf.erb"
+  owner node['freeradius']['user']
+  group node['freeradius']['group']
+  mode 0600
+  notifies :restart, "service[#{node['freeradius']['service']}]"
+end