diff --git a/.woodpecker.yaml b/.woodpecker.yaml index 8778427..6f9c873 100644 --- a/.woodpecker.yaml +++ b/.woodpecker.yaml @@ -1,19 +1,18 @@ # yes when: - branch: ["dev", "stable"] + branch: ['dev', 'stable'] event: ["push", "manual"] steps: - name: build image: woodpeckerci/plugin-docker-buildx + secrets: [ gitpat ] settings: - repo: git.iwakura.rip/hex/jabe + repo: git.iwakura.rip/hex/disseminate platforms: linux/amd64 dockerfile: Dockerfile - tags: - ["${CI_COMMIT_BRANCH}-latest", "${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA}"] + tags: ["${CI_COMMIT_BRANCH}-latest","${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA}"] username: hex - registry: - git.iwakura.rip + registry: git.iwakura.rip #insecure: true - password: + password: from_secret: gitpat diff --git a/Dockerfile b/Dockerfile index 190b9be..c61800d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,8 +18,7 @@ RUN cp -r /tmp/*.json /tmp/build/ && \ cp -r /tmp/src/views /tmp/build/src/ && \ cp -r /tmp/data.template /tmp/build && \ cp -r /tmp/scripts/docker_bootstrapper.sh /tmp/build/bootstrapper.sh && \ - cp -r /tmp/scripts/docker_run.sh /tmp/build/runner.sh && \ - cp -r /tmp/static /tmp/build/ + cp -r /tmp/scripts/docker_run.sh /tmp/build/runner.sh # The final version of disseminate is now in /tmp/build @@ -40,11 +39,11 @@ RUN deluser node # We want to run disseminate as a non-root user. ARG UID=1000 ARG GID=1000 -RUN addgroup -g $GID jabe && \ - adduser --home /app --uid $UID -G jabe --disabled-password jabe +RUN addgroup -g $GID disseminate && \ + adduser --home /app --uid $UID -G disseminate --disabled-password disseminate # Give our non-root user access to /app -RUN chown -R jabe:jabe /app +RUN chown -R disseminate:disseminate /app # Installing bash, mostly for debugging. RUN apk add bash @@ -53,7 +52,7 @@ RUN apk add bash COPY --chown=$UID:$GID --from=compiled /tmp/build/ /app RUN chown -R $UID:$GID /app # Switching to user. -USER jabe +USER disseminate # Installing the dependencies. RUN yarn install --production diff --git a/README.md b/README.md index 5fbd983..55ac0d7 100644 --- a/README.md +++ b/README.md @@ -1,37 +1,56 @@ -

JABE - Just Another Blogging Engine

+

Disseminate

+ Buy Me A Coffee status-badge
-## A short introduction -_JABE_ is a blogging platform designed to be lightweight, easy to use & powered by Markdown. +## A short introduction. + +*Disseminate* is a blogging platform designed to be lightweight, easy to use & powered by Markdown. It stems from an issue i've come across, where no blogging platform i could find was: -- easy to deploy. -- has fast loading times. -- simple enough for my -10 iq brain. +* easy to deploy. +* has fast loading times. +* simple enough for my -10 iq brain. + +## State of Project + +Disseminate is a work-in-progress, although it is in a more than usable state. + +## Blogs using Disseminate + +* [My own :)](https://penhub.nl) -## State of Project - -JABE is a work-in-progress, although it is in a more than usable state. - -## Blogs using JABE - -- [My own :)](https://blog.iwakura.rip) - -## To-do +## Opening an issue. + +Registrations are open again! Unfortunately however, i have to manually accept each account. +Please contact me via: + +* email (hex@clatter.cc) +* matrix (@hex:penhub.nl) +* telegram (@inimitableX) +* discord (@hex.maybe) +to get your account accepted. + +## To-do + - [x] [HIGH] Server-side parsing. - [x] [MEDIUM] Docker build system. -- [x] [MEDIUM] Proper metadata (title, date etc). +- [x] [MEDIUM] Proper metadata (title, date etc). - [x] [MEDIUM] **Automated** prebuilt docker images. - [ ] [LOW] Caching for faster load times. - [ ] [LOW] Interface for blog management (web ui?). - [ ] [LOW] Alternative frontend (solution)? (EJS is pretty primitive!) - -## License - -JABE uses the GNU GPLv3 license. + +## License + +Disseminate uses the GNU GPLv3 license. The two important points (in my opinion) are as follows: +* Any modifications made to disseminate should be open sourced. +* Any projects forking or using disseminate source code must be released under the same license (GNU GPLv3). + +Keep in mind that these two points are important **in my opinion**! Everything stated in the GNU GPLv3 license still applies. +(Paid) themes do *not* have to be open-sourced. diff --git a/data.template/posts/welcome.md b/data.template/posts/welcome.md index d6e1d7b..27c686c 100644 --- a/data.template/posts/welcome.md +++ b/data.template/posts/welcome.md @@ -1,13 +1,13 @@ -# Welcome to JABE - +# Welcome to Disseminate! + Welcome, user! We are glad to have you on board! To start, find the "posts" directory in the data folder you have created, or mounted using docker. -This is the same directory you put your config file in. - -Create a file named "hello.md", and start the file with: +This is the same directory you put your config file in. +Create a file named "hello.md", and start the file with: ``` # [Your Title] -``` - +``` + Now you can start writing blog posts! + diff --git a/docker-compose.build.yml b/docker-compose.build.yml index 9e35729..d555337 100644 --- a/docker-compose.build.yml +++ b/docker-compose.build.yml @@ -1,5 +1,5 @@ services: - jabe: + disseminate: build: context: . args: diff --git a/docker-compose.yml b/docker-compose.yml index 55450fc..efff7f3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,8 @@ -version: "3" +version: '3' services: - jabe: - container_name: jabe - image: git.iwakura.rip/hex/jabe:stable-latest + disseminate: + container_name: disseminate + image: git.clatter.cc/hexlocation/disseminate volumes: - ./data:/app/data # bind mount is recommended. ports: diff --git a/package-lock.json b/package-lock.json index 7b8d0bd..69a3a40 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "JABE", + "name": "disseminate", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/scripts/docker_bootstrapper.sh b/scripts/docker_bootstrapper.sh index 6952a67..70621f1 100755 --- a/scripts/docker_bootstrapper.sh +++ b/scripts/docker_bootstrapper.sh @@ -1,4 +1,4 @@ -cat < - powered by JABE + powered by Disseminate diff --git a/src/views/themes/iwakura/footer.ejs b/src/views/themes/iwakura/footer.ejs index 3147563..4ea0579 100644 --- a/src/views/themes/iwakura/footer.ejs +++ b/src/views/themes/iwakura/footer.ejs @@ -1,3 +1,3 @@
- powered by JABE + powered by Disseminate
diff --git a/src/views/themes/iwakura/global-style.ejs b/src/views/themes/iwakura/global-style.ejs index d7fc6d9..5648484 100644 --- a/src/views/themes/iwakura/global-style.ejs +++ b/src/views/themes/iwakura/global-style.ejs @@ -12,35 +12,13 @@ margin: auto; width: 50%; } - blockquote { - margin-left: 0; - padding-left: 10px; - margin-right: 0px; - color: gray; - } - blockquote p { - padding-left: 5px; - <% if(config.hasOwnProperty("themeOpts") && config.themeOpts.hasOwnProperty("accentColor")) { %> - border-left: 3px solid <%= config.themeOpts.accentColor %>; - <% } else { %> - border-left: 3px solid white; - <% } %> - } - blockquote p { - display: inline; - } - code, pre { + code { font-family: "Source Code Pro"; padding-left: 2px; padding-right: 2px; - border: 1px #111111 solid; - background-color: #111111; + border: 1px #2e2e2e solid; + background-color: #2e2e2e; border-radius: 5px; - white-space: pre-wrap; - word-wrap: break-word; - width: auto !important; - left: 0; - right: 0; } hr { color: white; @@ -63,8 +41,6 @@ <% } %> } #post-content { - word-wrap: break-word; - white-space: normal; font-family: "Arial"; } a {