Add favicon.ico

diff --git a/.gitignore b/.gitignore
index 2e831f0f7eb88dbcae52f1caf7c7da14269bdfa3..9ca3e1b72135243ecd95552d0fa6dd53fc86a33b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 node_modules
-/public/
+docs/.vuepress/public/
 *.log*

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a1d58a9f38d6b2c15da91e6a342ede9f559d9a07..6dc2b36ee01e8b1fde3f933f9e7f80ec7959f593 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ pages:
 
   artifacts:
     paths:
-    - public
+    - docs/.vuepress/public
   
   only:
   - master

diff --git a/deploy.sh b/deploy.sh
index 8e8410e50942257f86a8faec89c6545eba0cdc4f..fff8025a7feeff7937720eeb4e0737c3bfe2e06b 100755 (executable)
--- a/deploy.sh
+++ b/deploy.sh
@@ -6,10 +6,11 @@ set -e
 # build
 yarn build
 
-# copy output files to $HOME/www.zndr.dk
+# copy output files to $HOME/public
 echo "Copying files..." 
 
-rm -rf $HOME/www.zndr.dk/*
+rm -rf $HOME/public/*
 
-cp -R public/* $HOME/www.zndr.dk
+cp -R docs/.vuepress/public/* $HOME/public
+cp docs/img/favicon.ico $HOME/public
 

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index db9071d2f7dbb658deea25369444394b43203ed7..4f25b22a51cc6f2b712adeaa0c65916a3458817d 100644 (file)
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -13,22 +13,18 @@ module.exports = {
         ],
       },
     ],
-  ],
-}
-
-
-module.exports = {
-  markdown: {
-    lineNumbers: true
-  }
+  ]
 }
 
 
 module.exports = {
+  base: '/',
   title: 'zndr.dk',
-  description: 'Webserver',
-//  base: '/vuepress/',
-  dest: 'public',
+  description: 'Project for my Vuepress based Home webserver',
+  head: [
+    ['link', { rel: 'icon', href: '/favicon.ico' }]
+  ],
+  dest: 'docs/.vuepress/public',
   themeConfig: {
     sidebar:'false',
     nav: [
@@ -37,7 +33,7 @@ module.exports = {
           { text: 'Webmail',      link: 'https://mail.zndr.dk',  target:'_self', rel:'' },
           { text: 'Nextcloud',    link: 'https://cloud.zndr.dk', target:'_self', rel:'' },
           { text: 'PostfixAdmin', link: 'https://pfa.zndr.dk',   target:'_self', rel:'' },
-          { text: 'Gitlab',       link: 'https://git.zndr.dk',   target:'_self', rel:'' },
+          { text: 'GitLab',       link: 'https://git.zndr.dk',   target:'_self', rel:'' },
           { text: 'Plex',         link: 'https://play.zndr.dk',  target:'_self', rel:'' },
           { text: 'phpMyAdmin',   link: 'https://pma.zndr.dk',   target:'_self', rel:'' }
         ]
@@ -49,9 +45,12 @@ module.exports = {
       {
         text: 'About',
         link: '/about.html'
-      },
+      }
     ],
     lastUpdate: 'Last Updated',
     displayAllHeaders: true
+  },
+  markdown: {
+    lineNumbers: true
   }
 }

diff --git a/docs/img/favicon.ico b/docs/img/favicon.ico
new file mode 100644 (file)
index 0000000..beb88a4
Binary files /dev/null and b/docs/img/favicon.ico differ