From 89b46bf7caacf3525f10cc6996d5951c828417bc Mon Sep 17 00:00:00 2001
From: Grant Slater <git@firefishy.com>
Date: Thu, 1 Jan 2015 23:51:07 +0000
Subject: [PATCH] Cleanup planet-mirror redirect script + add missing deps

---
 cookbooks/planet/recipes/dump.rb                             | 4 ++++
 .../templates/default/planet-mirror-redirect-update.erb      | 5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb
index 7aca08442..63092565a 100644
--- a/cookbooks/planet/recipes/dump.rb
+++ b/cookbooks/planet/recipes/dump.rb
@@ -42,6 +42,10 @@ package "libosmpbf-dev"
 package "libprotobuf-dev"
 package "osmpbf-bin"
 
+# Add planet-mirror-redirect-update dependencies
+package "php5-cli"
+package "php5-curl"
+
 directory "/opt/planet-dump-ng" do
   owner "root"
   group "root"
diff --git a/cookbooks/planet/templates/default/planet-mirror-redirect-update.erb b/cookbooks/planet/templates/default/planet-mirror-redirect-update.erb
index 1f37ecd23..c673998e6 100644
--- a/cookbooks/planet/templates/default/planet-mirror-redirect-update.erb
+++ b/cookbooks/planet/templates/default/planet-mirror-redirect-update.erb
@@ -11,7 +11,7 @@ $_YEAR = date('Y');
 $_PLANET_FOLDER = '<%= node[:planet][:dump][:xml_directory] %>/'.$_YEAR.'/';
 $_PLANET_REGEX = "/^(planet|changesets)\-\d{6}(\-nolt)?\.osm\.(bz2|gz)$/";
 $_MIRROR = 'http://ftp.heanet.ie/mirrors/openstreetmap.org/planet/'.$_YEAR.'/';
-$_PLANET_HTACCESS = $_PLANET_FOLDER.'../../.htaccess';
+$_PLANET_HTACCESS = realpath($_PLANET_FOLDER.'../..').'/.htaccess';
 
 function _MIRROR_FILE_SIZE($url) {
 	$ch = @curl_init();
@@ -24,7 +24,7 @@ function _MIRROR_FILE_SIZE($url) {
 	return ($curl_result['download_content_length']);
 }			
 
-if (posix_getuid() !== fileowner($_PLANET_HTACCESS)) die('User ID of process does not match .htaccess owner'."\n");
+if (!is_writable($_PLANET_HTACCESS)) die('File '.$_PLANET_HTACCESS.' is not writable by current user.'."\n");
 
 if (is_dir($_PLANET_FOLDER)) {
 	$htaccess_contents = file_get_contents($_PLANET_HTACCESS);
@@ -53,4 +53,3 @@ if (is_dir($_PLANET_FOLDER)) {
 		fclose($htaccess_handle);
 	}
 }
-?>
-- 
2.43.2