Drop duplicate nickserv password line

[chef.git] / cookbooks / supybot / templates / default / supybot.conf.erb

diff --git a/cookbooks/supybot/templates/default/supybot.conf.erb b/cookbooks/supybot/templates/default/supybot.conf.erb
index a6bee5686f1a443704a17cfd8c77219dda6e65f3..7e7776cf2799e25708903596982676f76b927251 100644 (file)
--- a/cookbooks/supybot/templates/default/supybot.conf.erb
+++ b/cookbooks/supybot/templates/default/supybot.conf.erb
@@ -451,7 +451,7 @@ supybot.upkeepInterval: 3600
 #
 # Default value: True
 ###
-supybot.flush: True
+supybot.flush: False
 
 ###
 # Determines what characters are valid for quoting arguments to commands
@@ -637,6 +637,13 @@ supybot.directories.data: /var/lib/supybot/data
 ###
 supybot.directories.data.tmp: /var/lib/supybot/data/tmp
 
+###
+# Determines what directory files of the web server (templates, custom images, ...) are put into.
+#
+# Default value: web
+###
+supybot.directories.data.web: /var/lib/supybot/data/web
+
 ###
 # Determines what directory backup data is put into.
 #
@@ -887,7 +894,6 @@ supybot.plugins.Services.NickServ: NickServ
 #
 # Default value: 
 ###
-supybot.plugins.Services.NickServ.password: <%= @passwords["nickserv"] %>
 supybot.plugins.Services.NickServ.password.osmbot: <%= @passwords["nickserv"] %>
 
 ###