From 827c963895a15bfeaa33af32f9aeabbf2c674f2c Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Fri, 30 Nov 2018 10:43:41 +0100
Subject: [PATCH] Update upload script to new server user "ci".

On new server, the user `nightlybot` as been renamed to `ci`.
The path of the data used by the download server has also changed.
---
 appveyor/deploy.sh     | 2 +-
 travis/deploy.sh       | 6 +++---
 travis/deploy_apk.sh   | 4 ++--
 travis/make_release.sh | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/appveyor/deploy.sh b/appveyor/deploy.sh
index c65beef..0c58757 100755
--- a/appveyor/deploy.sh
+++ b/appveyor/deploy.sh
@@ -8,5 +8,5 @@ SSH_KEY=C:\\projects\\kiwix-build\\appveyor\\nightlybot_id_key
 #then
   scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \
     ${NIGHTLY_KIWIX_ARCHIVES_DIR} \
-    nightlybot@download.kiwix.org:/var/www/download.kiwix.org/nightly
+    ci@download.kiwix.org:/data/download/nightly
 #fi
diff --git a/travis/deploy.sh b/travis/deploy.sh
index c77af35..89eeba7 100755
--- a/travis/deploy.sh
+++ b/travis/deploy.sh
@@ -14,7 +14,7 @@ if [[ "$TRAVIS_EVENT_TYPE" = "cron" ]]
 then
   scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \
     ${NIGHTLY_KIWIX_ARCHIVES_DIR} \
-    nightlybot@download.kiwix.org:/var/www/download.kiwix.org/nightly
+    ci@download.kiwix.org:/data/download/nightly
   scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \
     ${NIGHTLY_ZIM_ARCHIVES_DIR} \
     ci@download.openzim.org:/data/openzim/nightly
@@ -29,7 +29,7 @@ then
       subdir=$(basename $(dirname $archive))
       scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \
         ${archive} \
-        nightlybot@download.kiwix.org:/var/www/download.kiwix.org/release/${subdir}
+        ci@download.kiwix.org:/data/download/release/${subdir}
     done
   fi
 
@@ -53,7 +53,7 @@ then
       subdir=$(basename $(dirname $archive))
       scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \
         ${archive} \
-        nightlybot@download.kiwix.org:/var/www/download.kiwix.org/release/${subdir}
+        ci@download.kiwix.org:/data/download/release/${subdir}
     done
   fi
 
diff --git a/travis/deploy_apk.sh b/travis/deploy_apk.sh
index 420a4ec..cabaa84 100755
--- a/travis/deploy_apk.sh
+++ b/travis/deploy_apk.sh
@@ -20,8 +20,8 @@ TOOLCHAINS/android-sdk-r25.2.3/build-tools/25.0.2/apksigner sign \
   --out ${SIGNED_APK} \
   ${INPUT_APK_FILE}
 
-ssh -i ${SSH_KEY} nightlybot@download.kiwix.org "mkdir -p ${DEPLOY_DIR}"
+ssh -i ${SSH_KEY} ci@download.kiwix.org "mkdir -p ${DEPLOY_DIR}"
 
 scp -i ${SSH_KEY} \
   ${SIGNED_APK} \
-  nightlybot@download.kiwix.org:${DEPLOY_DIR}
+  ci@download.kiwix.org:${DEPLOY_DIR}
diff --git a/travis/make_release.sh b/travis/make_release.sh
index 4f2e034..a875ab2 100755
--- a/travis/make_release.sh
+++ b/travis/make_release.sh
@@ -13,9 +13,9 @@ BASE_DIR="BUILD_${PLATFORM}"
 
 mkdir -p ${HOME}/APKS
 
-scp -i ${SSH_KEY} nightlybot@download.kiwix.org:${DEPLOY_DIR}/* ${HOME}/APKS
+scp -i ${SSH_KEY} ci@download.kiwix.org:${DEPLOY_DIR}/* ${HOME}/APKS
 
-ssh -i ${SSH_KEY} nightlybot@download.kiwix.org "rm -rf ${DEPLOY_DIR}"
+ssh -i ${SSH_KEY} ci@download.kiwix.org "rm -rf ${DEPLOY_DIR}"
 
 ${TRAVIS_BUILD_DIR}/build_custom_app.py \
   --step publish \