From 700b28ae38adcdc01ffb8c176a613d405960ae87 Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Thu, 27 Mar 2014 11:09:18 -0400
Subject: [PATCH] CC-5708: proftpd hook for new File API

removed testing lines
---
 python_apps/airtime_analyzer/tools/ftp-upload-hook.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/python_apps/airtime_analyzer/tools/ftp-upload-hook.sh b/python_apps/airtime_analyzer/tools/ftp-upload-hook.sh
index 1e05ff8d6..9a9858347 100755
--- a/python_apps/airtime_analyzer/tools/ftp-upload-hook.sh
+++ b/python_apps/airtime_analyzer/tools/ftp-upload-hook.sh
@@ -13,16 +13,14 @@ vhost_file=/mnt/airtimepro/system/vhost.map
 #instance_path will look like 1/1384, for example
 instance_path=$(echo $file_path | grep -Po "(?<=($base_instance_path)).*?(?=/srv)")
 
-#url to the airtime interface. bananas.airtime.pro, for example
+#post request url - http://bananas.airtime.pro/rest/media, for example
 url=http://
-url+=$(grep -E $instance_path ~/vhost.map | awk '{print $1;}')
+url+=$(grep -E $instance_path $vhost_file | awk '{print $1;}')
 url+=/rest/media
-#url=$(grep -E $instance_path $vhost_file | awk '{print $1;}')
 
 #path to specific instance's airtime.conf
 instance_conf_path=$base_instance_path$instance_path$airtime_conf_path
 
-api_key=$(sudo awk -F "=" '/api_key/ {print $2}' /etc/airtime/airtime.conf)
-#api_key=$(sudo awk -F "=" '/api_key/ {print $2}' $instance_conf_path)
+api_key=$(sudo awk -F "=" '/api_key/ {print $2}' $instance_conf_path)
 
 #curl $url -u $api_key":" -X POST -F "file=@$file_path" -F "name=$filename"