diff --git a/Makefile b/Makefile index 7d12913..bd43dbf 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,8 @@ dockerserver: dockerbuild @docker run \ -e JEKYLL_PORT=4000 \ -e JEKYLL_HOST=0.0.0.0 \ + -e JEKYLL_CONFIG=_config_dev.yml \ -p 4000:4000 \ + -d \ autonomic/autonomic.zone:testing .PHONY: dockerserver diff --git a/_config_dev.yml b/_config_dev.yml new file mode 100644 index 0000000..721961b --- /dev/null +++ b/_config_dev.yml @@ -0,0 +1,27 @@ +--- +title: Autonomic Co-operative +email: helo@autonomic.zone +description: Sustainability, Transparency, Privacy +baseurl: "" +url: "https://site.autonomic.zone" +source: src +destination: dist +sass: + sass_dir: ./assets/styles +featured-image-source: +500px_url: +github_url: +mastodon_url: https://sunbeam.city/@autonomic +twitter_url: https://twitter.com/autonomiccoop +markdown: kramdown +permalink: pretty +collections: + posts: + output: true + permalink: /blog/:title/ + clients: + output: false +exclude: + - vendor + - Gemfile + - Gemfile.lock diff --git a/_config.yml b/_config_prod.yml similarity index 100% rename from _config.yml rename to _config_prod.yml diff --git a/ansible/pre-deploy.yml b/ansible/pre-deploy.yml index 0806bbc..f693f7b 100644 --- a/ansible/pre-deploy.yml +++ b/ansible/pre-deploy.yml @@ -50,4 +50,4 @@ DOKKU_LETSENCRYPT_EMAIL: "{{ autonomic_admin_mail }}" JEKYLL_HOST: "0.0.0.0" JEKYLL_PORT: "{{ http_port }}" - JEKYLL_BASEURL: "//{{ domain }}" + JEKYLL_CONFIG: "{{ jekyll_config }}" diff --git a/ansible/vars/all.yml b/ansible/vars/all.yml index 33257b2..f1e5733 100644 --- a/ansible/vars/all.yml +++ b/ansible/vars/all.yml @@ -4,3 +4,4 @@ autonomic_admin_mail: "helo@autonomic.zone" dokku_domain_ipv4: "94.130.105.60" domain: "site.autonomic.zone" http_port: "4000" +jekyll_config: "_config_prod.yml" diff --git a/sbin/entrypoint.sh b/sbin/entrypoint.sh index a1f41fe..a94976f 100755 --- a/sbin/entrypoint.sh +++ b/sbin/entrypoint.sh @@ -7,7 +7,7 @@ run_jekyll() { set -eu bundle exec jekyll serve \ - --baseurl "$JEKYLL_BASEURL" \ + --config "$JEKYLL_CONFIG" \ --host "$JEKYLL_HOST" \ --port "$JEKYLL_PORT" \ --trace