Merge branch 'develop' into 'master'

Adding blog link to nav bar

See merge request warricksothr/sothr-dot-com!5

.gitlab-ci.yml

@@ -14,11 +14,13 @@ build-website:
     - tar -czvf website.tgz -C /output/ .
   only:
     - master
+    - develop
   tags:
     - docker
   artifacts:
     paths:
     - website.tgz
+    expire_in: 1 week
  
 deploy-website:
   image: sothr.com/deploy:ubuntu
@@ -35,6 +37,8 @@ deploy-website:
     - rsync -avz --delete-delay -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p $DEPLOY_PORT" --progress /tmp/deploy/* $DEPLOY_USER@$DEPLOY_HOST:$TARGET_DIRECTORY
   only:
     - master
+  dependencies:
+    - build-website
   tags:
     - docker
   environment: production

config.toml

@@ -7,20 +7,29 @@ theme = "pure"
 CopyrightHolder = "Drew Short"
 CopyrightYear = "2014"
 [params.links]
+
+[params.links.blog]
+weight = 40
+title = "Blog"
+url = "https://blog.nulloctet.com"
+
 [params.links.resume]
-weight = 10
+weight = 30
 title = "Résumé"
 url = "https://sothr.com/resume/"
+
 [params.links.gitlab]
-weight = 2
+weight = 20
 title = "GitLab"
 image = "assets/img/gitlab.svg"
 url = "https://gitlab.com/WarrickSothr"
+
 [params.links.github]
-weight = 1
+weight = 10
 title = "GitHub"
 image = "assets/img/github.png"
 url = "https://github.com/warricksothr/"
+
 [params.links.linkedin]
 title = "LinkedIn"
 image = "assets/img/linkedin.png"