Merge branch 'easy-ruby-version' into rails-3-develop

6 files changed, 7 insertions, 7 deletions

diff --git a/config/alert-tracks-debian.ugly b/config/alert-tracks-debian.example
index a098bc332..a098bc332 100755
--- a/config/alert-tracks-debian.ugly
+++ b/config/alert-tracks-debian.example
diff --git a/config/purge-varnish-debian.ugly b/config/purge-varnish-debian.example
index 457a77ed8..457a77ed8 100755
--- a/config/purge-varnish-debian.ugly
+++ b/config/purge-varnish-debian.example
diff --git a/config/sysvinit-passenger.ugly b/config/sysvinit-passenger.example
index 0940a4d63..0940a4d63 100755
--- a/config/sysvinit-passenger.ugly
+++ b/config/sysvinit-passenger.example
diff --git a/config/sysvinit-thin.ugly b/config/sysvinit-thin.example
index 0155ff8c3..0155ff8c3 100755
--- a/config/sysvinit-thin.ugly
+++ b/config/sysvinit-thin.example
diff --git a/lib/tasks/config_files.rake b/lib/tasks/config_files.rake
index 1528d7324..f6b25185e 100644
--- a/lib/tasks/config_files.rake
+++ b/lib/tasks/config_files.rake
@@ -11,7 +11,7 @@ namespace :config_files do
                 var = $1.to_sym
                 replacement = replacements[var]
                 if replacement == nil
-                    raise "Unhandled variable in .ugly file: $#{var}"
+                    raise "Unhandled variable in example file: $#{var}"
                 else
                     replacements[var]
                 end
@@ -21,9 +21,9 @@ namespace :config_files do
         converted_lines
     end
 
-    desc 'Convert Debian .ugly init script in config to a form suitable for installing in /etc/init.d'
+    desc 'Convert Debian example init script in config to a form suitable for installing in /etc/init.d'
     task :convert_init_script => :environment do
-        example = 'rake config_files:convert_init_script DEPLOY_USER=deploy VHOST_DIR=/dir/above/alaveteli VCSPATH=alaveteli SITE=alaveteli SCRIPT_FILE=config/alert-tracks-debian.ugly'
+        example = 'rake config_files:convert_init_script DEPLOY_USER=deploy VHOST_DIR=/dir/above/alaveteli VCSPATH=alaveteli SITE=alaveteli SCRIPT_FILE=config/alert-tracks-debian.example'
         check_for_env_vars(['DEPLOY_USER',
                             'VHOST_DIR',
                             'SCRIPT_FILE'], example)
@@ -37,7 +37,7 @@ namespace :config_files do
         }
 
         # Use the filename for the $daemon_name ugly variable
-        daemon_name = File.basename(ENV['SCRIPT_FILE'], '-debian.ugly')
+        daemon_name = File.basename(ENV['SCRIPT_FILE'], '-debian.example')
         replacements.update(:daemon_name => "#{ replacements[:site] }-#{ daemon_name }")
 
         # Generate the template for potential further processing
@@ -57,7 +57,7 @@ namespace :config_files do
         end
     end
 
-    desc 'Convert Debian .ugly crontab file in config to a form suitable for installing in /etc/cron.d'
+    desc 'Convert Debian example 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 MAILTO=cron-alaveteli@example.org'
         check_for_env_vars(['DEPLOY_USER',
diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh
index fba164213..ac2280e72 100755
--- a/script/site-specific-install.sh
+++ b/script/site-specific-install.sh
@@ -208,14 +208,14 @@ echo $DONE_MSG
 
 if [ ! "$DEVELOPMENT_INSTALL" = true ]; then
   echo -n "Creating /etc/init.d/$SITE... "
-  (su -l -c "cd '$REPOSITORY' && bundle exec rake config_files:convert_init_script DEPLOY_USER='$UNIX_USER' VHOST_DIR='$DIRECTORY' VCSPATH='$SITE' SITE='$SITE' SCRIPT_FILE=config/sysvinit-thin.ugly" "$UNIX_USER") > /etc/init.d/"$SITE"
+  (su -l -c "cd '$REPOSITORY' && bundle exec rake config_files:convert_init_script DEPLOY_USER='$UNIX_USER' VHOST_DIR='$DIRECTORY' VCSPATH='$SITE' SITE='$SITE' SCRIPT_FILE=config/sysvinit-thin.example" "$UNIX_USER") > /etc/init.d/"$SITE"
   chgrp "$UNIX_USER" /etc/init.d/"$SITE"
   chmod 754 /etc/init.d/"$SITE"
   echo $DONE_MSG
 fi
 
 echo -n "Creating /etc/init.d/$SITE-alert-tracks... "
-(su -l -c "cd '$REPOSITORY' && bundle exec rake config_files:convert_init_script DEPLOY_USER='$UNIX_USER' VHOST_DIR='$DIRECTORY' SCRIPT_FILE=config/alert-tracks-debian.ugly" "$UNIX_USER") > /etc/init.d/"$SITE-alert-tracks"
+(su -l -c "cd '$REPOSITORY' && bundle exec rake config_files:convert_init_script DEPLOY_USER='$UNIX_USER' VHOST_DIR='$DIRECTORY' SCRIPT_FILE=config/alert-tracks-debian.example" "$UNIX_USER") > /etc/init.d/"$SITE-alert-tracks"
 chgrp "$UNIX_USER" /etc/init.d/"$SITE-alert-tracks"
 chmod 754 /etc/init.d/"$SITE-alert-tracks"
 echo $DONE_MSG