From 015d36ef915aa3e1882f79d3cea2cee9ea54aaf2 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sat, 13 Feb 2021 14:04:38 +0100 Subject: [PATCH 1/2] Add change to compile with all threads again Accidentally removed this on the last commits Adds change from commit ec86734ea1767a726f8a90ed1a68a95c0b5512dc again --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4ffb604..7f28978 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ENV RUSTFLAGS='-C target-feature=-crt-static' WORKDIR /app COPY ./site . RUN apk add --no-cache musl-dev sqlite-dev -RUN cargo install --path . +RUN cargo install --path . -j $(nproc) FROM alpine:latest From 0ab9e1272356f192c4598b088d5ea456793a834a Mon Sep 17 00:00:00 2001 From: Manuel Date: Sat, 13 Feb 2021 14:13:17 +0100 Subject: [PATCH 2/2] Use example from README.md as default crablog.env --- README.md | 6 +++--- crablog.env | 13 ++++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index bc1bab5..af6f0cf 100644 --- a/README.md +++ b/README.md @@ -23,10 +23,10 @@ docker-compose up -d ## Configuration environment file -All configuration options are defined in .env, to be created in the same directory as this readme. - -An example configuration: +All configuration options are defined in crablog.env, an example configuration is provided. +When not using Docker you may have to add crablog.env to your startup script or define the variables there. +`crablog.env` ``` USERNAME=yourusername EMAIL=me@mydomain.tld diff --git a/crablog.env b/crablog.env index 1bacdfe..0342b21 100644 --- a/crablog.env +++ b/crablog.env @@ -1,6 +1,9 @@ -SUBMIT_TOKEN=mysupersecretpw +USERNAME=yourusername +EMAIL=me@mydomain.tld BIND_PORT=8000 -USERNAME= -EMAIL= -TWITTER_ACCOUNT= -GITHUB_ACCOUNT= \ No newline at end of file +SUBMIT_TOKEN=Submit!123 # token needed for submitting +GITHUB_ACCOUNT=usernam3 +TWITTER_ACCOUNT=usernam3 +MASTODON_ACCOUNT=usernam3@mastodon.social +REDDIT_ACCOUNT=usernam3 +DISCORD_ACCOUNT=usernam3 \ No newline at end of file