From 08d9166bfcb77d380b5c09b127a70844ae65edcc Mon Sep 17 00:00:00 2001
From: Julien Dessaux
Date: Sun, 29 Nov 2020 15:01:07 +0100
Subject: Updated www.adyxax.org articles

---
 content/en/blog/miscellaneous/switching-to-hugo.md | 49 +++++++++++++++++++++-
 content/en/docs/adyxax.org/services/www.md         | 37 ++++++----------
 2 files changed, 60 insertions(+), 26 deletions(-)

diff --git a/content/en/blog/miscellaneous/switching-to-hugo.md b/content/en/blog/miscellaneous/switching-to-hugo.md
index 7468667..739b36d 100644
--- a/content/en/blog/miscellaneous/switching-to-hugo.md
+++ b/content/en/blog/miscellaneous/switching-to-hugo.md
@@ -8,4 +8,51 @@ description: >
 
 This is the website you are currently reading. It is a static website built using hugo. This article details how I installed hugo, how I initialised this website and how I manage it. I often refer to it as wiki.adyxax.org because I hosted a unique dokuwiki for a long time as my main website (and a pmwiki before that), but with hugo it has become more than that. It is now a mix of wiki, blog and showcase of my work and interests.
 
-[Here is the link to the full article describing how I achieved that.]({{< relref "/docs/adyxax.org/services/www.md" >}})
+## Installing hugo
+
+{{< highlight sh >}}
+go get github.com/gohugoio/hugo
+{{< / highlight >}}
+
+You probably won't encounter this issue but this command failed at the time I installed hugo because the master branch in one of the dependencies was
+tainted. I fixed it with by using a stable tag for this project and continue installing hugo from there:
+{{< highlight sh >}}
+cd go/src/github.com/tdewolff/minify/
+tig --all
+git checkout v2.6.1
+go get github.com/gohugoio/hugo
+{{< / highlight >}}
+
+This did not build me the extended version of hugo that I need for the [docsy](https://github.com/google/docsy) theme I chose, so I had to get it by doing :
+{{< highlight sh >}}
+cd ~/go/src/github.com/gohugoio/hugo/
+go get --tags extended
+go install --tags extended
+{{< / highlight >}}
+
+## Bootstraping this site
+
+{{< highlight sh >}}
+hugo new site www
+cd www
+git init
+git submodule add https://github.com/google/docsy themes/docsy
+{{< / highlight >}}
+
+The docsy theme requires two nodejs programs to run :
+{{< highlight sh >}}
+npm install -D --save autoprefixer
+npm install -D --save postcss-cli
+{{< / highlight >}}
+
+## hugo commands
+
+To spin up the live server for automatic rebuilding the website when writing articles :
+{{< highlight sh >}}
+hugo server --bind 0.0.0.0 --minify --disableFastRender
+{{< / highlight >}}
+
+To publish the website in the `public` folder :
+{{< highlight sh >}}
+hugo --minify
+{{< / highlight >}}
diff --git a/content/en/docs/adyxax.org/services/www.md b/content/en/docs/adyxax.org/services/www.md
index c50ffa6..852cfcc 100644
--- a/content/en/docs/adyxax.org/services/www.md
+++ b/content/en/docs/adyxax.org/services/www.md
@@ -10,35 +10,22 @@ This is the website you are currently reading. It is a static website built usin
 installed hugo, how I initialised this website and how I manage it. I often refer to it as wiki.adyxax.org because I hosted a unique dokuwiki for a long
 time as my main website (and a pmwiki before that), but with hugo it has become more than that. It is now a mix of wiki, blog and showcase of my work and interests.
 
-## Installing hugo
-
-{{< highlight sh >}}
-go get github.com/gohugoio/hugo
-{{< / highlight >}}
+For a log of how I made the initial setup, see [this blog article.]({{< relref "/blog/miscellaneous/switching-to-hugo.md" >}})
 
-You probably won't encounter this issue but this command failed at the time I installed hugo because the master branch in one of the dependencies was
-tainted. I fixed it with by using a stable tag for this project and continue installing hugo from there:
-{{< highlight sh >}}
-cd go/src/github.com/tdewolff/minify/
-tig --all
-git checkout v2.6.1
-go get github.com/gohugoio/hugo
-{{< / highlight >}}
+## Installing hugo
 
-This did not build me the extended version of hugo that I need for the [docsy](https://github.com/google/docsy) theme I chose, so I had to get it by doing :
+I am currently hosting this website on an OpenBSD server. Hugo is packaged on this system so the installation is as simple as :
 {{< highlight sh >}}
-cd ~/go/src/github.com/gohugoio/hugo/
-go get --tags extended
-go install --tags extended
+pkg_add hugo--extended
 {{< / highlight >}}
 
 ## Bootstraping this site
 
+The website is on my gitea :
 {{< highlight sh >}}
-hugo new site www
+cd /var/www/htdocs
+git clone --recurse-submodules _gitea@git.adyxax.org:adyxax/www.git
 cd www
-git init
-git submodule add https://github.com/google/docsy themes/docsy
 {{< / highlight >}}
 
 The docsy theme requires two nodejs programs to run :
@@ -49,12 +36,12 @@ npm install -D --save postcss-cli
 
 ## hugo commands
 
-To spin up the live server for automatic rebuilding the website when writing articles :
-{{< highlight sh >}}
-hugo server --bind 0.0.0.0 --minify --disableFastRender
-{{< / highlight >}}
-
 To publish the website in the `public` folder :
 {{< highlight sh >}}
 hugo --minify
 {{< / highlight >}}
+
+## TODO
+
+TODO deploy on push to git.adyxax.org
+TODO web server config
-- 
cgit v1.2.3