Avoid hypens in munin variable names for composite graphs

[chef.git] / cookbooks / subversion / recipes / default.rb

diff --git a/cookbooks/subversion/recipes/default.rb b/cookbooks/subversion/recipes/default.rb
index 1a52b9f426adcba3648a0531d254b16b83cbaab7..96941ed73d125b3c9a2fe5c0c56c348b58f8caac 100644 (file)
--- a/cookbooks/subversion/recipes/default.rb
+++ b/cookbooks/subversion/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache"
+include_recipe "apache::ssl"
 
 package "subversion"
 
@@ -28,23 +28,38 @@ remote_directory "#{repository_directory}/hooks" do
   source "hooks"
   owner "www-data"
   group "www-data"
-  mode 0755
+  mode 0o755
   files_owner "www-data"
   files_group "www-data"
-  files_mode 0755
+  files_mode 0o755
   purge false
 end
 
-apache_module "authz_svn" do
-  package "libapache2-svn"
+apache_module "dav" do
+  package "apache2"
+end
+
+apache_module "dav_fs" do
+  package "apache2"
 end
 
 apache_module "dav_svn" do
   package "libapache2-svn"
 end
 
+apache_module "authz_svn" do
+  package "libapache2-svn"
+end
+
 apache_site site_name do
   template "apache.erb"
   directory repository_directory
   variables :realm => "Subversion Repository", :password_file => "/etc/apache2/svn.passwd"
 end
+
+template "/etc/cron.daily/svn-backup" do
+  source "backup.cron.erb"
+  owner "root"
+  group "root"
+  mode 0o755
+end