Commit 87a6f68d authored by yova's avatar yova 💫

merge

parents 00e4cce6 39d7e5ec
Pipeline #267 passed with stages
in 5 minutes and 23 seconds
BUILDPACK_URL=https://github.com/ecobytes/buildpack-nginx.git
stages:
- build
- deploy
- build-prod
- deploy-prod
variables:
NAME: "anonymous"
EMAIL: "status@ecobytes.net"
build-dev:
image: jguyomard/hugo-builder
stage: build
only:
- master
variables:
GIT_SUBMODULE_STRATEGY: recursive
HUGO_BASEURL: http://$APP_NAME_DEV.dokku.ecobytes.net/
script:
- hugo
artifacts:
paths:
- public/
deploy-dev:
image: alpine
stage: deploy
environment:
name: development
url: http://$APP_NAME_DEV.dokku.ecobytes.net/
only:
- master
before_script:
- apk add --no-cache git openssh
- mkdir -p ~/.ssh
- echo "$SSH_PRIVATE_KEY" >> ~/.ssh/id_rsa
- chmod 600 ~/.ssh/id_rsa
- echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
script:
- cd public
- git init
- git add -A .
- git commit -m runner
- git remote add dokku dokku@dokku.ecobytes.net:$APP_NAME_DEV
- git push -vv dokku +master
build-prod:
image: jguyomard/hugo-builder
stage: build-prod
when: manual
allow_failure: false
only:
- master
variables:
GIT_SUBMODULE_STRATEGY: recursive
script:
- hugo -b https://$APP_NAME/
dependencies: []
artifacts:
paths:
- public/
deploy-prod:
image: alpine
stage: deploy-prod
environment:
name: production
url: $APP_NAME
only:
- master
dependencies:
- build-prod
before_script:
- apk add --no-cache git openssh
- mkdir -p ~/.ssh
- echo "$SSH_PRIVATE_KEY" >> ~/.ssh/id_rsa
- chmod 600 ~/.ssh/id_rsa
- echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
script:
- cd public
- git init
- git add -A .
- git commit -m runner
- git remote add dokku dokku@dokku.ecobytes.net:$APP_NAME
- git push -vv dokku +master
[submodule "themes/detox"]
path = themes/detox
url = https://lab.allmende.io/solidbase/website-theme.git
[submodule "public"]
path = public
url = dokku@apps.allmende.io:solidbase.info
url = ../website-theme.git
This diff is collapsed.
......@@ -4,22 +4,29 @@ This is the source code for [`solidbase.info`](https://solidbase.info).
## Dependencies
- Hugo Extended
i.e. as a Snap package https://gohugo.io/getting-started/installing/#linux
- Node.js, ideally via nvm.sh
- [Hugo](https://gohugo.io/getting-started/installing/)
- [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
## Submodules
## Run locally
```
git clone git@lab.allmende.io:solidbase/learn.git
cd learn
git submodule sync
git submodule update --init --recursive --remote
hugo serve
```
## Deployment
```
./deploy
```
This repo uses [gitlab CI/CD](https://docs.gitlab.com/ce/ci/#exploring-gitlab-ci-cd) for deployment to [dokku](http://dokku.viewdocs.io/dokku/). See the [pipeline configuration](https://lab.allmende.io/solidbase/website/blob/master/.gitlab-ci.yml) for details.
The following Variables needs to be set as under `Settings->CI/CD->Variables`:
- `APP_NAME_DEV`: The SLD name for the *staging instance*, which will become accessible under `$APP_NAME_DEV.dokku.ecobytes.net`
- `APP_NAME`: A fqdn for the *production instance*
- `SSH_PRIVATE_KEY`: A key for the dokku, defined as project wide variable
Deployment to *production* needs to be maually triggered in the pipeline view.
## Authors
......@@ -28,4 +35,4 @@ git submodule update --init --recursive --remote
## License
CC0
[GPL3](LICENSE)
baseURL = "https://solidbase.info/"
baseURL = "https://solidbase.info:443/"
languageCode = "en-us"
title = "Solid Base"
theme = "detox"
......
---
title: "Documentation"
date: "2019-09-17"
---
<center>
Find the documentation of the app on https://learn.solidbase.info/de/solidbase/.
</center>
---
title: "First budgets modeled"
description: "The development took a good start. Find here screenshots of the first modeled budgets."
date: "2019-01-29"
---
For modelling the first budget we took some example data from [Richard Wiswall's **The Organic Farmer's Business Handbook**](https://www.richardwiswall.com/the-organic-farmer-s-business-handb). This is how it looks:
![Wiswall Budget](/screenshots/wiswall2009.png)
---
---
---
Next step is to tackle monthly data for which we have a preview:
![First monthly data](/screenshots/monthly-first.png)
---
title: "Software recommendations"
description: "Here you find the results of the solidbase software research compress to a commented list of software recommendations."
date: 2018-09-04
description: "Here you find the results of the solidbase software research compressed to a commented list of software recommendations."
date: 2019-09-18
---
# SolidBase Software recommendations
For the erasmus+ project *solid base* we conducted a survey where we asked *Solidarity based Food Systems* (SFS) which software is in use by them. Combined with prior research in the [*Free and Libre Open Source Software* (FLOSS)](https://www.gnu.org/philosophy/floss-and-foss.en.html) milieu, we can now give the following recommendations for dedicated CSA tools and for tools of more general applicability.
......@@ -40,7 +40,7 @@ Functionality | Juntagrico | Sunu | Cagette | OpenFoodNetwork | ACP-Admi
:---------------------|:--:|:----:|:-------:|:---:|:--------:|:----:
Members administration | x | x | x | x | x | x
Email members | x | x | x | x | x | x
Delivery planning | | x | x | x | x | x
Delivery planning | x | x | x | x | x | x
Share management | x | x | x | | x | x
Variable Orders | | | x | x | | x
Control of payments | x | x | x | x | x | x
......@@ -142,6 +142,7 @@ All CMS of interest are libre software now. Next to [WordPress](https://wordpres
- https://www.concrete5.org/
- https://hexo.io/
- https://gohugo.io/
- https://getgrav.org/
### Cloud services
......@@ -150,7 +151,7 @@ Next to the conventional gdrive and dropbox the FLOSS [Nextcloud](https://nextcl
## Providers for online communication
### Lists of libre hosters
- https://github.com/libresh/awesome-librehosters
- https://lab.libreho.st/librehosters
- https://riseup.net/de/security/resources/radical-servers
- [Chatons collective of independent hosters](https://chatons.org/en/chatons-collective-independant-transparent-open-neutral-and-ethical-hosters-providing-floss-based)
......@@ -172,12 +173,10 @@ Next to the conventional gdrive and dropbox the FLOSS [Nextcloud](https://nextcl
- https://www.infomaniak.com
- https://www.hosteurope.de/en/
- https://www.webnode.cz
- https://hosting.aruba.it/
- https://www.letshost.ie/
- https://www.hosteurope.de/en/
### All in one website systems
- http://blogsport.de/
- https://www.blogger.com
- https://www.squarespace.com/
- https://www.wix.com/
......
#!/bin/bash
echo -e "\033[0;32mDeploying updates to GitLab and Dokku...\033[0m"
# Commit changes.
msg="rebuilding site `date`"
if [ $# -eq 1 ]
then msg="$1"
fi
git add .
git commit -m "pre $msg"
# Build the project.
cd public && git checkout master && cd -
rm -rf public/*
hugo # if using a theme, replace with `hugo -t <YOURTHEME>`
# Go To Public folder
cd public
# Add changes to git.
git add .
git commit -m "$msg"
# Push built repo.
git push
# Come Back up to the Project Root
cd ..
git add .
git commit -m "post $msg"
git push
public @ c0cce765
Subproject commit c0cce7657d6d3809d4ce36748b336c28be01cfbf
BUILDPACK_URL=https://github.com/ecobytes/buildpack-nginx.git
BUILDPACK_URL=https://github.com/dokku/buildpack-nginx.git
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment