Merge branch 'master' of git.ericxliu.me:eric/ericxliu-me

.drone.yml

@@ -2,27 +2,71 @@ kind: pipeline
 name: default
 
 steps:
+- name: git-clone
+  image: alpine/git
+  environment:
+    SSH_KEY:
+      from_secret: ssh_key
+  volumes:
+  - name: output
+    path: /output
+  commands:
+    - mkdir -p  $HOME/.ssh
+    - echo "$SSH_KEY" > $HOME/.ssh/id_rsa
+    - chmod 400 $HOME/.ssh/id_rsa
+    - ssh-keyscan -H git.ericxliu.me > $HOME/.ssh/known_hosts
+    - git clone --branch gitea-pages git@git.ericxliu.me:eric/ericxliu-me.git /output
+    - find /output -mindepth 1 -not -regex "^.*\/.git.*" -delete
+- name: submodules
+  image: alpine/git
+  commands:
+  - git submodule update --init --recursive
 - name: build
   image: plugins/hugo
+  volumes:
+  - name: output
+    path: /output
   settings:
     hugo_version: 0.97.0
     extended: true
     minify: true
-    pull: always
+    url: "https://ericxliu.me"
-    url: ericxliu.me
     validate: false
-    output: "./output"
+    output: /output
-    mtu: 1450
+- name: add-commit-hash
+  image: alpine/git
+  volumes:
+  - name: output
+    path: /output
+  commands:
+    - sed -i 's/\[commit\]/\[${DRONE_COMMIT_SHA:0:7}\]/g' /output/index.html
 - name: git-push
   image: appleboy/drone-git-push:0.2.0-linux-amd64
+  volumes:
+  - name: output
+    path: /output
   settings:
     branch: gitea-pages
     remote: "git@git.ericxliu.me:eric/ericxliu-me.git"
     force: true
     commit: true
-    path: "./output"
+    path: /output
     commit_message: "Drone build ${DRONE_COMMIT_SHA:0:7}"
     author_name: "Eric Liu"
     author_email: "eric@ericxliu.me"
     ssh_key:
-      from_secret: ssh_key
+      from_secret: ssh_key
+- name: k8s-delete-pod
+  image: alpine/curl
+  environment:
+    TOKEN:
+      from_secret: token
+    APISERVER: "https://10.10.0.10:6443"
+  commands:
+    - "curl -X DELETE $APISERVER/api/v1/namespaces/hugo/pods/ --header \"Authorization: Bearer $TOKEN\" --insecure"
+volumes:
+- name: output
+  temp: {}
+trigger:
+  branch:
+  - master

.gitignore

@@ -1 +1,13 @@
-_gen/
+# Generated files by hugo
+/public/
+/resources/_gen/
+/assets/jsconfig.json
+hugo_stats.json
+
+# Executable may be added to repository
+hugo.exe
+hugo.darwin
+hugo.linux
+
+# Temporary lock file while building
+/.hugo_build.lock

README.md

@@ -0,0 +1,3 @@
+
+# ericxliu.me
+[![Build Status](https://drone.ericxliu.local/api/badges/eric/ericxliu-me/status.svg?ref=refs/heads/master)](https://drone.ericxliu.local/eric/ericxliu-me)

config.toml

@@ -1,16 +1,17 @@
 title = "Eric's Personal Page"
-
 theme = "hugo-coder"
-
 languageCode = "en"
 defaultcontentlanguage = "en"
-
 paginate = 20
-canonifyurls = true
+#canonifyurls = true
 
-pygmentsstyle = "b2"
+pygmentsstyle = "bw"
 pygmentscodefences = true
 pygmentscodefencesguesssyntax = true
+enableEmoji = true
+enableTwemoji = true
+enableGitInfo = true
+
 
 [params] # theme parameters
     author = "Eric Liu"
@@ -18,21 +19,18 @@ pygmentscodefencesguesssyntax = true
     description = "Eric Liu's personal website"
     keywords = "blog,developer,personal" 
     avatarurl = "images/gravatar.png"
-
+    hideFooter = false
-    # wether you want to hide copyright and credits in the footer
     hideCredits = true
     hideCopyright = false
-
+    since = 2016
     rtl= false
-
+    commit="https://git.ericxliu.me/eric/ericxliu-me/commit"
-    colorscheme = "light"
+    colorscheme = "auto"
+    hideColorSchemeToggle = false
 
     # Series see also post count
     maxSeeAlsoItems = 5
 
-    # Enable Twemoji
-    enableTwemoji = true
-
     # Custom CSS
     custom_css = []
 
@@ -42,17 +40,17 @@ pygmentscodefencesguesssyntax = true
 # Social links
 [[params.social]]
     name = "Git"
-    icon = "fab fa-gitlab"
+    icon = "fa fa-gitlab"
     weight = 1
     url = "https://git.ericxliu.me/eric"
 [[params.social]]
     name = "linkedin"
-    icon = "fab fa-linkedin"
+    icon = "fa fa-linkedin"
     weight = 2
     url = "https://www.linkedin.com/in/eric-liu-46648b93/"
 [[params.social]]
     name = "Personal email"
-    icon = "fas fa-envelope-square"
+    icon = "fa fa-envelope"
     weight = 3
 
 # Menu links
@@ -64,21 +62,17 @@ pygmentscodefencesguesssyntax = true
 	    weight = 1
 	    url  = "/posts/"
 	[[languages.en.menu.main]]
-	    name = "Gitlab"
+	    name = "Git"
 	    weight = 2
 	    url  = "https://git.ericxliu.me"
 	[[languages.en.menu.main]]
-	    name = "Notebook"
+	    name = "Nextcloud"
 	    weight = 3
-	    url  = "https://hub.ericxliu.me"
+	    url  = "https://cloud.ericxliu.me"
-	[[languages.en.menu.main]]
-	    name = "Go"
-	    weight = 4
-	    url  = "https://go.ericxliu.me/server"
 	[[languages.en.menu.main]]
 	    name = "|"
 	    weight = 10
 	[[languages.en.menu.main]]
 	    name = "Sign in"
 	    weight = 11
-	    url  = "https://auth.ericxliu.me"
+	    url  = "https://sso.ericxliu.me"

layouts/partials/footer.html

@@ -0,0 +1,22 @@
+{{ if not .Site.Params.hideFooter | default false }}
+  <footer class="footer">
+    <section class="container">
+      {{ with .Site.Params.footerContent | safeHTML }}
+        <p>{{ . }}</p>
+      {{ end }}
+      {{ if not .Site.Params.hideCopyright }}
+        ©
+        {{ if (and (.Site.Params.since) (lt .Site.Params.since now.Year)) }}
+          {{ .Site.Params.since }} -
+        {{ end }}
+        {{ now.Year }}
+        {{ with .Site.Params.author }} {{ . }} {{ end }}
+      {{ end }}
+      {{ if not .Site.Params.hideCredits }}
+        {{ if not .Site.Params.hideCopyright }} · {{ end }}
+        {{ i18n "powered_by" }} <a href="https://gohugo.io/">Hugo</a> & <a href="https://github.com/luizdepra/hugo-coder/">Coder</a>.
+      {{ end }}
+      [commit]
+    </section>
+  </footer>
+{{ end }}