merging master changes into testing

Squashed commit of the following:

commit 3dbabfbfb3ac45e24894d4869c0fd0d9b7a82756
Author: surtur <a_mirre@utb.cz>
Date:   Thu Feb 20 06:17:34 2020 +0100

    accomodate for adding of drone + cosmetic changes

commit 976958461d85d22c7a0721137970838274b40a32
Merge: efacaa0 4e69fa9
Author: surtur <a_mirre@utb.cz>
Date:   Tue Feb 18 00:30:53 2020 +0100

    Merge 'origin/dev' into master

    Signed-off-by: surtur <a_mirre@utb.cz>

commit 4e69fa9404cb0e79e846982d5a8d35b94e38aa67
Author: surtur <a_mirre@utb.cz>
Date:   Tue Feb 18 00:23:35 2020 +0100

    forgot this is git, not btrfs... fixing

commit 96aec19aa2516618f3b5bc487178ad7255ae9d76
Author: surtur <a_mirre@utb.cz>
Date:   Mon Feb 17 23:55:56 2020 +0100

    PC above all

commit 640726ee9c9c3b0a38508d2d47a4a09658bff4c0
Author: surtur <a_mirre@utb.cz>
Date:   Mon Feb 17 23:51:14 2020 +0100

    improvements in the deploy script logic

commit be63d93aa365b4f2294476e451e27dbc83f0a80d
Merge: efacaa0 fa4d4f4
Author: surtur <a_mirre@utb.cz>
Date:   Mon Feb 17 23:43:03 2020 +0100

    Merge remote-tracking branch 'origin/develop'

commit fa4d4f448b7627d76f1322ce3eeba880a7bc808c
Author: surtur <a_mirre@utb.cz>
Date:   Mon Feb 17 23:04:16 2020 +0100

    minor updates to content pages

commit 2956d3a7fae10f48cf3c8b0d421688166b6fd17a
Author: surtur <a_mirre@utb.cz>
Date:   Mon Feb 17 23:01:30 2020 +0100

    correct some instances of undesirable casing

    - also: set sub-title text to 'hello friend' (hello friend? that's lame. maybe I should give you a name.)

commit 74ff5f012664f2bcada93f79d2e7209e18addb65
Author: surtur <a_mirre@utb.cz>
Date:   Mon Feb 17 21:49:50 2020 +0100

     removing forgotten cache
This commit is contained in:
surtur 2020-02-27 16:21:07 +01:00
parent d4691f3c34
commit 2f0d0b7fab
Signed by: wanderer
GPG Key ID: 19CE1EC1D9E0486D
7 changed files with 23 additions and 18 deletions

@ -1,4 +1,4 @@
Just a bunch of shit that will make up a dotya landing page. sawce that makes up the dotya.ml landing page.
Built with [Hugo](https://gohugo.io) on [Hello Friend NG](https://themes.gohugo.io/hugo-theme-hello-friend-ng/) theme. Built with [Hugo](https://gohugo.io) on [Hello Friend NG](https://themes.gohugo.io/hugo-theme-hello-friend-ng/) theme.

@ -12,7 +12,7 @@ theme = "hello-friend-ng"
dateformNumTime = "2006-01-02 15:04 -0700" dateformNumTime = "2006-01-02 15:04 -0700"
# Metadata mostly used in document's head # Metadata mostly used in document's head
description = "Dotya.ml" description = "dotya.ml"
keywords = "homepage, development, git, programming" keywords = "homepage, development, git, programming"
images = [""] images = [""]
@ -21,7 +21,7 @@ theme = "hello-friend-ng"
# Default theme "light" or "dark" # Default theme "light" or "dark"
defaultTheme = "dark" defaultTheme = "dark"
homeSubtitle = "Hello" homeSubtitle = "hello friend. hello friend? that's lame. maybe I should give you a name."
[params.logo] [params.logo]
logoText = "dotya.ml" logoText = "dotya.ml"
@ -39,7 +39,7 @@ theme = "hello-friend-ng"
[languages.en] [languages.en]
title = "dotya.ml" title = "dotya.ml"
subtitle = "" subtitle = ""
keywords = "" keywords = "homepage, development, git, programming"
copyright = '<a href="http://www.wtfpl.net/about/" rel="noopener">WTFPL</a>' copyright = '<a href="http://www.wtfpl.net/about/" rel="noopener">WTFPL</a>'
readOtherPosts = "" readOtherPosts = ""
@ -55,22 +55,26 @@ theme = "hello-friend-ng"
[languages.en.menu] [languages.en.menu]
[[languages.en.menu.main]] [[languages.en.menu.main]]
identifier = "about" identifier = "about"
name = "About" name = "about"
url = "/about" url = "/about"
[[languages.en.menu.main]] [[languages.en.menu.main]]
identifier = "git" identifier = "gitea"
name = "Git" name = "gitea"
url = "https://git.dotya.ml" url = "https://git.dotya.ml"
[[languages.en.menu.main]]
identifier = "drone"
name = "drone"
url = "https://drone.dotya.ml"
[[languages.en.menu.main]] [[languages.en.menu.main]]
identifier = "status" identifier = "status"
name = "Status" name = "status"
url = "/status" url = "/status"
# And you can even create generic menu # And you can even create generic menu
[menu] [menu]
[[menu.main]] [[menu.main]]
identifier = "about" identifier = "about"
name = "About" name = "about"
url = "/about" url = "/about"
[[menu.main]] [[menu.main]]
identifier = "" identifier = ""

@ -1,4 +1,4 @@
# dotya.ml # about dotya.ml
Free services provided for fun as a hobby. So far we have [git](https://git.dotya.ml) Free services provided for fun as a hobby. So far we have [gitea](https://git.dotya.ml) and a [drone.io](https://drone.io) ci/cd instance integration is [on the way](https://drone.dotya.ml).

@ -1,3 +1,4 @@
# dotya status # dotya.ml status
![Mozilla HTTP Observatory Grade](https://img.shields.io/mozilla-observatory/grade/dotya.ml)
Any information regarding status of the site and services will be posted here. Any information regarding status of the site and services will be posted here.

4
deploy

@ -4,6 +4,8 @@ USER=y192235
HOST=mrkev.fme.vutbr.cz HOST=mrkev.fme.vutbr.cz
DIR=public_html/ DIR=public_html/
hugo && rsync -avz --delete public/ ${USER}@${HOST}:~/${DIR} git submodule init
git submodule update
hugo --gc=true && rsync -avz --delete public/ ${USER}@${HOST}:~/${DIR}
exit 0 exit 0

@ -1 +0,0 @@
{"Target":"main.min.7bfbbe12786fa0ded4b4c0d792cbb36a5bd0bdb0b856dde57aa7b1f6fe0f2b87.css","MediaType":"text/css","Data":{"Integrity":"sha256-e/u+EnhvoN7UtMDXksuzalvQvbC4Vt3leqex9v4PK4c="}}