From dc940bb5b1552d9be312cf96e6c31a160ab6ab0b Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 1 Oct 2019 22:04:40 +0200 Subject: [PATCH 1/4] First commit to donation --- donate | 25 +++++++++++++++++++++++++ index.md | 3 ++- index_ar.md | 3 ++- index_de.md | 3 ++- index_es.md | 3 ++- index_fr.md | 3 ++- index_it.md | 3 ++- 7 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 donate diff --git a/donate b/donate new file mode 100644 index 00000000..3c88974c --- /dev/null +++ b/donate @@ -0,0 +1,25 @@ +# What for? +Donations are used to cover infrastructure costs (servers, domain names, ..), communication (stickers, conference, ...) and possibly development on the long term. + +# 2019/2020 Budget + + * Revenu + * Donations via Liberapay : current is 45€/week, -> 2340€/year + * NLNet 20K€ + + * Expenses + * Server renting => 1000€ + * Forum: 14.4€/month => 172.80€/Year + * CI: 20€/mois to be confirmed => 240€/Year + * Bearnaise server migration bearnaise => 587.2€ + * Domain names => 150€ + * nohost.me : 11.99€HT/Year + * ynh.fr : 6.99€HT/Year (voir avec frju?) + * noho.st : ~35€ TTC/Year + * YunoHost.org :13.99€HT/Year + * YunoHost.com ??? 9.99€HT/Year + * labriqueinter.net ?? 12.49€Ht/Year + * internetcu.be ?? 17.99€HT/Year + * Communication => 200€ + * Travel (to go at conferencies) => 500€ + * Bank account 7x12€ => 100€ \ No newline at end of file diff --git a/index.md b/index.md index 21576d77..5feb2a24 100644 --- a/index.md +++ b/index.md @@ -23,7 +23,8 @@ diff --git a/index_ar.md b/index_ar.md index 1e6f7574..3a495680 100644 --- a/index_ar.md +++ b/index_ar.md @@ -20,7 +20,8 @@ diff --git a/index_de.md b/index_de.md index 5f679c8a..b324ad47 100644 --- a/index_de.md +++ b/index_de.md @@ -24,7 +24,8 @@ diff --git a/index_es.md b/index_es.md index b28e306c..b408427d 100644 --- a/index_es.md +++ b/index_es.md @@ -23,7 +23,8 @@ diff --git a/index_fr.md b/index_fr.md index d358e760..9dd58f21 100644 --- a/index_fr.md +++ b/index_fr.md @@ -19,7 +19,8 @@ diff --git a/index_it.md b/index_it.md index ee0bc581..870ec5c3 100644 --- a/index_it.md +++ b/index_it.md @@ -24,7 +24,8 @@ From 4cdd9b68f5c8cad8e00d91e2d9c84b62dde1a0ed Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 1 Oct 2019 23:54:50 +0200 Subject: [PATCH 2/4] Rename donate to donate.md --- donate => donate.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename donate => donate.md (96%) diff --git a/donate b/donate.md similarity index 96% rename from donate rename to donate.md index 3c88974c..58cefc50 100644 --- a/donate +++ b/donate.md @@ -22,4 +22,4 @@ Donations are used to cover infrastructure costs (servers, domain names, ..), co * internetcu.be ?? 17.99€HT/Year * Communication => 200€ * Travel (to go at conferencies) => 500€ - * Bank account 7x12€ => 100€ \ No newline at end of file + * Bank account 7x12€ => 100€ From ca7f38d9a802fa66926d79906082120612815b7e Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 2 Oct 2019 00:10:27 +0200 Subject: [PATCH 3/4] Improve formating of the budget --- donate.md | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/donate.md b/donate.md index 58cefc50..1690d749 100644 --- a/donate.md +++ b/donate.md @@ -1,25 +1,29 @@ # What for? -Donations are used to cover infrastructure costs (servers, domain names, ..), communication (stickers, conference, ...) and possibly development on the long term. +Donations are used to cover infrastructure costs (servers, domain names, ..), communication (stickers, conference, ...) and possibly development on the long term. Below is a draft of budget detailing our expected expenses and revenues # 2019/2020 Budget - * Revenu - * Donations via Liberapay : current is 45€/week, -> 2340€/year - * NLNet 20K€ +## Expected revenues - * Expenses - * Server renting => 1000€ - * Forum: 14.4€/month => 172.80€/Year - * CI: 20€/mois to be confirmed => 240€/Year - * Bearnaise server migration bearnaise => 587.2€ - * Domain names => 150€ - * nohost.me : 11.99€HT/Year - * ynh.fr : 6.99€HT/Year (voir avec frju?) - * noho.st : ~35€ TTC/Year - * YunoHost.org :13.99€HT/Year - * YunoHost.com ??? 9.99€HT/Year - * labriqueinter.net ?? 12.49€Ht/Year - * internetcu.be ?? 17.99€HT/Year - * Communication => 200€ - * Travel (to go at conferencies) => 500€ - * Bank account 7x12€ => 100€ +* Donations via Liberapay: current is 45€/week, so about 2340€/year +* Grant from NLNet: 20K€, to be used for R&D + +## Expected expenses + +* Server renting: ~1000€ + * Forum: 14.4€/month: 172.80€/Year + * CI: 20€/mois to be confirmed: 240€/Year + * Bearnaise server migration bearnaise: 587.2€ +* Domain names: ~150€ + * nohost.me: 11.99€HT/Year + * ynh.fr: 6.99€HT/Year (voir avec frju?) + * noho.st: ~35€ TTC/Year + * YunoHost.org: 13.99€HT/Year + * YunoHost.com: 9.99€HT/Year + * labriqueinter.net: 12.49€Ht/Year + * internetcu.be: 17.99€HT/Year +* Communication: ~200€ +* Travel (e.g. to go to conferences): ~500€ +* Bank account fees: 7x12€ => ~100€ + +Total is about 2000€ From 879204141ec812587ba886b4f6a18e0f747f54e8 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 3 Oct 2019 15:38:07 +0200 Subject: [PATCH 4/4] Update and rename donate.md to project_budget.md --- donate.md | 29 ----------------------------- project_budget.md | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 29 deletions(-) delete mode 100644 donate.md create mode 100644 project_budget.md diff --git a/donate.md b/donate.md deleted file mode 100644 index 1690d749..00000000 --- a/donate.md +++ /dev/null @@ -1,29 +0,0 @@ -# What for? -Donations are used to cover infrastructure costs (servers, domain names, ..), communication (stickers, conference, ...) and possibly development on the long term. Below is a draft of budget detailing our expected expenses and revenues - -# 2019/2020 Budget - -## Expected revenues - -* Donations via Liberapay: current is 45€/week, so about 2340€/year -* Grant from NLNet: 20K€, to be used for R&D - -## Expected expenses - -* Server renting: ~1000€ - * Forum: 14.4€/month: 172.80€/Year - * CI: 20€/mois to be confirmed: 240€/Year - * Bearnaise server migration bearnaise: 587.2€ -* Domain names: ~150€ - * nohost.me: 11.99€HT/Year - * ynh.fr: 6.99€HT/Year (voir avec frju?) - * noho.st: ~35€ TTC/Year - * YunoHost.org: 13.99€HT/Year - * YunoHost.com: 9.99€HT/Year - * labriqueinter.net: 12.49€Ht/Year - * internetcu.be: 17.99€HT/Year -* Communication: ~200€ -* Travel (e.g. to go to conferences): ~500€ -* Bank account fees: 7x12€ => ~100€ - -Total is about 2000€ diff --git a/project_budget.md b/project_budget.md new file mode 100644 index 00000000..9d461450 --- /dev/null +++ b/project_budget.md @@ -0,0 +1,28 @@ +# Project budget + +# Estimated budget for 2019/2020 + +## Expected revenues + +* Donations via Liberapay: current is about 45€/week, so about 2340€/year +* Grant from NLNet: 20K€, to be used for R&D (TODO: publish the project plan once validated with NLnet) + +## Expected expenses + +* Server renting: ~1000€ + * Forum: 14.4€/month: 172.80€/year + * CI: 20€/month (to be confirmed): 240€/year + * Bearnaise server migration to a new machine: 587.2€ +* Domain names: ~150€ + * nohost.me: 11.99€HT/year + * ynh.fr: 6.99€HT/year (to be confirmed with frju?) + * noho.st: ~35€ TTC/year + * YunoHost.org: 13.99€HT/year + * YunoHost.com: 9.99€HT/year + * labriqueinter.net: 12.49€Ht/year + * internetcu.be: 17.99€HT/year +* Communication: ~200€ +* Travel (e.g. to go to conferences): ~500€ +* Bank account fees: 7x12€ => ~100€ + +**Total**: about 2000€