Merge branch 'master' into denon-avr-4520
This commit is contained in:
commit
2dcbe8e27e
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -3,3 +3,6 @@
|
||||||
|
|
||||||
# Other things
|
# Other things
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
|
||||||
|
# Low resolution image, generated by CI
|
||||||
|
/static/img/thumbs
|
|
@ -2,7 +2,19 @@ image: ariejan/dockerized-hugo:latest
|
||||||
|
|
||||||
test:
|
test:
|
||||||
script:
|
script:
|
||||||
|
# Compile
|
||||||
- hugo
|
- hugo
|
||||||
|
|
||||||
|
# Compress CSS
|
||||||
|
- yui-compressor public/css/style.css -o public/css/style-min.css
|
||||||
|
- mv -f public/css/style-min.css public/css/style.css
|
||||||
|
|
||||||
|
# Mogrify thumbnails
|
||||||
|
- mkdir -p public/img/thumbs
|
||||||
|
- cd public/img
|
||||||
|
- mogrify -format png -path thumbs -thumbnail 724 *.png
|
||||||
|
- mogrify -format jpg -path thumbs -thumbnail 724 *.jpg
|
||||||
|
|
||||||
except:
|
except:
|
||||||
- master
|
- master
|
||||||
|
|
||||||
|
@ -23,7 +35,14 @@ pages:
|
||||||
- yui-compressor public/css/style.css -o public/css/style-min.css
|
- yui-compressor public/css/style.css -o public/css/style-min.css
|
||||||
- mv -f public/css/style-min.css public/css/style.css
|
- mv -f public/css/style-min.css public/css/style.css
|
||||||
|
|
||||||
|
# Mogrify thumbnails
|
||||||
|
- mkdir -p public/img/thumbs
|
||||||
|
- cd public/img
|
||||||
|
- mogrify -format png -path thumbs -thumbnail 724 *.png
|
||||||
|
- mogrify -format jpg -path thumbs -thumbnail 724 *.jpg
|
||||||
|
|
||||||
# Deploy
|
# Deploy
|
||||||
|
- cd "$CI_PROJECT_DIR"
|
||||||
- rsync -az4 --stats --delete-after public/* ariejan@mail.devroom.io:/home/ariejan/www/devroom.io/
|
- rsync -az4 --stats --delete-after public/* ariejan@mail.devroom.io:/home/ariejan/www/devroom.io/
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
|
|
13
bin/thumbs
Executable file
13
bin/thumbs
Executable file
|
@ -0,0 +1,13 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
echo "-- Cleaning old thumbnails"
|
||||||
|
cd static/img
|
||||||
|
rm -rf thumbs
|
||||||
|
|
||||||
|
echo "-- Generating thumbnails"
|
||||||
|
mkdir -p thumbs
|
||||||
|
mogrify -format png -path thumbs -thumbnail 724 *.png
|
||||||
|
mogrify -format jpg -path thumbs -thumbnail 724 *.jpg
|
||||||
|
|
||||||
|
echo "-- Done"
|
||||||
|
cd ../..
|
41
config.toml
41
config.toml
|
@ -1,17 +1,52 @@
|
||||||
baseurl = "https://www.devroom.io/"
|
baseurl = "https://www.devroom.io/"
|
||||||
languageCode = "en-us"
|
builddrafts = false
|
||||||
|
canonifyurls = true
|
||||||
|
contentdir = "content"
|
||||||
|
languageCode = "en-US"
|
||||||
|
layoutdir = "layouts"
|
||||||
|
publishdir = "public"
|
||||||
|
theme = "cocoa-eh"
|
||||||
title = "ariejan de vroom"
|
title = "ariejan de vroom"
|
||||||
copyright = "Ariejan de Vroom"
|
copyright = "Ariejan de Vroom"
|
||||||
|
disqusshortname = ""
|
||||||
|
pluralizelisttitles = false
|
||||||
|
|
||||||
PygmentsCodeFences = true
|
PygmentsCodeFences = true
|
||||||
pygmentsuseclasses = false
|
pygmentsuseclasses = false
|
||||||
pygmentsstyle = "monokai"
|
pygmentsstyle = "pastie"
|
||||||
|
|
||||||
[author]
|
[author]
|
||||||
name = "Ariejan de Vroom"
|
name = "Ariejan de Vroom"
|
||||||
|
|
||||||
[permalinks]
|
[permalinks]
|
||||||
posts = "/:year/:month/:day/:slug/"
|
blog = "/:year/:month/:day/:slug/"
|
||||||
|
electronics = "/:year/:month/:day/:slug/"
|
||||||
|
|
||||||
[taxonomies]
|
[taxonomies]
|
||||||
category = "categories"
|
category = "categories"
|
||||||
|
tag = "tags"
|
||||||
|
|
||||||
|
[params]
|
||||||
|
dateform = "2 Jan, 2006"
|
||||||
|
dateformfull = "Mon 2 Jan 2006 15:04:05 MST"
|
||||||
|
description = "a blog by ariejan de vroom about software engineering and electronics."
|
||||||
|
copyright = "Copyright © 1996 - 2017 Ariejan de Vroom"
|
||||||
|
copyrightUrl = "https://creativecommons.org/licenses/by/4.0/"
|
||||||
|
logofile = "img/logo.png"
|
||||||
|
faviconfile = "favicon.ico"
|
||||||
|
highlightjs = false
|
||||||
|
progressively = false
|
||||||
|
share = true
|
||||||
|
latestpostcount = 7
|
||||||
|
github = "ariejan"
|
||||||
|
email = "ariejan@devroom.io"
|
||||||
|
linkedin = "ariejan"
|
||||||
|
twitter = "ariejan"
|
||||||
|
facebook = ""
|
||||||
|
social_banner = "img/banner.png"
|
||||||
|
usesmallsummarycard = true
|
||||||
|
posts_navigation = true
|
||||||
|
# issoHost = "comments.domain.tld:1234"
|
||||||
|
# githubRepo = "githubUsername/repositoryName"
|
||||||
|
small_banner_logo = false
|
||||||
|
book_recommendations = true
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user