Don't disable loopback connection tracking on 14.04

[chef.git] / cookbooks / trac / templates / default / trac.ini.erb

diff --git a/cookbooks/trac/templates/default/trac.ini.erb b/cookbooks/trac/templates/default/trac.ini.erb
index 6e08158ddf39acc4d3ac40508303ad8fa12429f0..3cff049beeec5cbe6fd995b4524bb578e6a0f3f6 100644 (file)
--- a/cookbooks/trac/templates/default/trac.ini.erb
+++ b/cookbooks/trac/templates/default/trac.ini.erb
@@ -23,6 +23,7 @@ max_diff_files = 0
 wiki_format_messages = true
 
 [components]
+tracopt.ticket.deleter = enabled
 tracopt.versioncontrol.git.* = enabled
 tracopt.versioncontrol.svn.* = enabled
 
@@ -41,7 +42,7 @@ templates_dir =
 [intertrac]
 josm.compat = false
 josm.title = JOSM Trac
-josm.url = http://josm.openstreetmap.de
+josm.url = https://josm.openstreetmap.de
 
 [logging]
 log_file = trac.log
@@ -94,10 +95,10 @@ use_tls = false
 admin = 
 admin_trac_url = .
 descr = OpenStreetMap is a free editable map of the whole world
-footer = Visit the map at<br /><a href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>
+footer = Visit the map at<br /><a href="https://www.openstreetmap.org/">https://www.openstreetmap.org/</a>
 icon = site/osm.ico
 name = OpenStreetMap
-url = http://www.openstreetmap.org/
+url = https://www.openstreetmap.org/
 
 [query]
 default_anonymous_query = status!=closed&cc~=$USER
@@ -113,13 +114,13 @@ items_per_page_rss = 0
 subversion.dir = /var/lib/subversion/repos/openstreetmap
 subversion.description = Legacy subversion repository
 subversion.type = svn
-subversion.url = http://svn.openstreetmap.org/
+subversion.url = https://svn.openstreetmap.org/
 subversion.hidden = true
 <% Dir.glob("/var/lib/git/*.git").sort.each do |repository| -%>
 <%= File.basename(repository, ".git") %>.dir = <%= repository %>
 <%= File.basename(repository, ".git") %>.description = <%= IO.read("#{repository}/description").strip %>
 <%= File.basename(repository, ".git") %>.type = git
-<%= File.basename(repository, ".git") %>.url = git://git.openstreetmap.org/<%= File.basename(repository) %>
+<%= File.basename(repository, ".git") %>.url = https://git.openstreetmap.org/public/<%= File.basename(repository) %>
 <% end -%>
 .alias = subversion