From 2b079924c75e082f0ed9f82eaf733031e6531db1 Mon Sep 17 00:00:00 2001
From: Nathan Schneider <nathan.schneider@colorado.edu>
Date: Wed, 10 Jul 2019 22:14:11 +0000
Subject: [PATCH] Trying jekyll deploy

---
 .gitlab-ci.yml | 24 +++++++++++-------------
 _config.yml    |  5 +++--
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3cf7497..3420fc7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,25 +5,23 @@ stages:
 
 before_script:
 #  - apt-get update -qq && apt-get install -y -qq libcurl4-openssl-dev lftp
-  - apt-get update -qq && apt-get install -y -qq rsync sshpass
   - bundle install
   - gem install jekyll
 
 deploy_script:
-  stage: deploy
-  only:
-    - master
-  environment:
-    name: website
-    url: https://cmci.colorado.edu/cmci
-  script:
-    - echo "Building.."
-    - bundle exec jekyll build --config _config.yml
-    - echo "Deploying.."
-    - cd _site && rsync --verbose -crPze ssh --delete --rsh="sshpass -p $CU_PASSWORD ssh -o StrictHostKeyChecking=no " ./* $CU_USR@$CU_HOSTNAME:/data/web/htdocs/cmci/medlab
-    - echo "Done!"
+  - jekyll deploy
+
+#  stage: deploy
+#  only:
+#    - master
+#  environment:
+#    name: website
+#    url: https://cmci.colorado.edu/cmci
+#  script:
+#    - echo "Building.."
 #    - chmod +x ./_scripts/build.sh
 #    - ./_scripts/build.sh
+#    - echo "Deploying.."
 #    - chmod +x ./_scripts/deploy_website.sh
 #    - ./_scripts/deploy_website.sh
 
diff --git a/_config.yml b/_config.yml
index f2b484c..f4fb30d 100644
--- a/_config.yml
+++ b/_config.yml
@@ -36,8 +36,9 @@ collections:
 deploy:
 #  - cd .. && jekyll build
 #  - cd .. && read -p 'Commit message: ' message && git commit -a -m $message
-  - rsync -crPze ssh --delete ./* nasc0399@cmci.colorado.edu:/data/web/htdocs/cmci/medlab
-        
+  - rsync -crPze --delete --rsh="sshpass -p $CU_PASSWORD ssh -o StrictHostKeyChecking=no " ./* $CU_USR@$CU_HOST:/data/web/htdocs/cmci/medlab
+#  - rsync -crPze ssh --delete ./* nasc0399@cmci.colorado.edu:/data/web/htdocs/cmci/medlab
+
 # Exclude from processing.
 # The following items will not be processed, by default. Create a custom list
 # to override the default setting.