From ba67583127e153d3ec8f8e828e5699ccbe153d47 Mon Sep 17 00:00:00 2001
From: Mark Longair <mhl@pobox.com>
Date: Thu, 31 Oct 2013 13:18:06 +0000
Subject: Fix an undefined variable error

I assume 'skip' must have been an argument to this function
before it was introduced into our repository.
---
 lib/tasks/config_files.rake | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'lib/tasks/config_files.rake')

diff --git a/lib/tasks/config_files.rake b/lib/tasks/config_files.rake
index d3843f3a4..33e4a9e00 100644
--- a/lib/tasks/config_files.rake
+++ b/lib/tasks/config_files.rake
@@ -11,11 +11,7 @@ namespace :config_files do
                 var = $1.to_sym
                 replacement = replacements[var]
                 if replacement == nil
-                    if ! (skip[var] == true)
-                        raise "Unhandled variable in .ugly file: $#{var}"
-                    else
-                        match
-                    end
+                    raise "Unhandled variable in .ugly file: $#{var}"
                 else
                     replacements[var]
                 end
@@ -53,4 +49,4 @@ namespace :config_files do
     end
 
 
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From aa9998404c976019de6355ec9a88c1884046a2ae Mon Sep 17 00:00:00 2001
From: Mark Longair <mhl@pobox.com>
Date: Thu, 31 Oct 2013 13:06:59 +0000
Subject: Add a rake task to rewrite the crontab-example file

As suggested by Louise Crow, this new rake task reuses
the convert_ugly function to rewrite the crontab-example
file into a usable crontab file.
---
 lib/tasks/config_files.rake | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'lib/tasks/config_files.rake')

diff --git a/lib/tasks/config_files.rake b/lib/tasks/config_files.rake
index 33e4a9e00..d0e4001f0 100644
--- a/lib/tasks/config_files.rake
+++ b/lib/tasks/config_files.rake
@@ -48,5 +48,23 @@ namespace :config_files do
         end
     end
 
+    desc 'Convert Debian .ugly crontab file in config to a form suitable for installing in /etc/cron.d'
+    task :convert_crontab => :environment do
+        example = 'rake config_files:convert_crontab DEPLOY_USER=deploy VHOST_DIR=/dir/above/alaveteli VCSPATH=alaveteli SITE=alaveteli CRONTAB=config/crontab-example'
+        check_for_env_vars(['DEPLOY_USER',
+                            'VHOST_DIR',
+                            'VCSPATH',
+                            'SITE',
+                            'CRONTAB'], example)
+        replacements = {
+            :user => ENV['DEPLOY_USER'],
+            :vhost_dir => ENV['VHOST_DIR'],
+            :vcspath => ENV['VCSPATH'],
+            :site => ENV['SITE']
+        }
+        convert_ugly(ENV['CRONTAB'], replacements).each do |line|
+            puts line
+        end
+    end
 
 end
-- 
cgit v1.2.3