From 0604409587f911235af22d25e6d85ce54b9a7cc1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Kr=C3=BCger?= <jk@jk.gs> Date: Wed, 22 Jun 2022 01:33:24 +0200 Subject: [PATCH] html: rework docs about operation, pledging etc. This is a consequence of us migrating away from dedicated hardware and hosting by cuni.cz. * German law now probably applies, too * Update info about how rorcz is hosted * Update info about sponsoring * Add sponsoring philosophy * Add operations history (cuni.cz, upc.cz) * Update wording about sponsored development * Clarify that we're not pledging anymore --- Girocco/Config.pm | 2 +- html/about.html | 35 +++++++++++++++++++++++------------ html/pledge.html | 18 +++++++++++++++++- html/sponsoring.html | 29 +++++++++++++++++++++++++++++ html/volunteers.html | 4 +--- 5 files changed, 71 insertions(+), 17 deletions(-) create mode 100644 html/sponsoring.html diff --git a/Girocco/Config.pm b/Girocco/Config.pm index fe58947..d7508c0 100644 --- a/Girocco/Config.pm +++ b/Girocco/Config.pm @@ -745,7 +745,7 @@ our $lighttpd_tls_virtualhost = 1; our $legalese = <<EOT; <p>By submitting this form, you are confirming that you will mirror or push only free software and redistributing it will not violate any law -of Czech Republic. +of Czech Republic, Germany or the European Union in general. <sup class="sup"><span><a href="/about.html">(more details)</a></span></sup> </p> EOT diff --git a/html/about.html b/html/about.html index 6bb2091..37016b8 100644 --- a/html/about.html +++ b/html/about.html @@ -31,9 +31,9 @@ repository; you don't need to be the project maintainer to setup a mirror.</p> <ul> <li>Your project must be free software and distributing it must not violate laws -of Czech Republic. (The registration process is completely automatic but we will -remove your project if we find out during manual inspection or on request by -someone relevant.)</li> +of Czech Republic and Germany (and just to be safe, all laws common to the European Union). +(The registration process is completely automatic but we will remove your project +if we find out during manual inspection or on request by someone relevant.)</li> <li>The repository size should not exceed 400M after repacking (let us know if you need an exception). If you need more, you are running quite a big project and should be able to arrange own hosting; but we can and likely will @@ -65,20 +65,31 @@ in the future if the service becomes popular enough.</p> <h2>Operation</h2> -<p>repo.or.cz runs on a four-way Xeon 2GHz with 4G RAM and 256G disk array -that also serves as a PoP for the <a href="http://www.xs26.net/">XS26</a> -IPv6 tunnel broker. -The server and connectivity is generously sponsored by -<a href="http://www.upc.cz/">UPC Czech Republic</a>.</p> +<p>repo.or.cz is the brain child of <a href="mailto:pasky@suse.cz">Petr Baudis</a> +who also ran it all by himself for many years. -<p><a href="mailto:pasky@suse.cz">Petr Baudis</a> runs the site. -Virtually all the infrastructure is available +<p>repo.or.cz runs on a Hetzner Cloud VPS with redundant block storage for +the repositories. The server and connectivity is sponsored by (part of) the +repo.or.cz admin team (<a href="sponsoring.html">details</a>). + +<p>Virtually all the infrastructure is available in git repositories <a href="@@giroccourl@@">girocco.git</a> and <a href="@@gitweburl@@/girocco-gitweb.git">girocco-gitweb.git</a> and is licenced under GPLv2. -repo.or.cz/Girocco development is sponsored by SUSE / Novell Inc. -and Novartis Pharma, AG.</p> +<p>Initial development of repo.or.cz/Girocco development was sponsored by +SUSE / Novell Inc. and Novartis Pharma AG.</p> + +<h3>Operation history</h3> + +<ul> +<li>Until June 2022, repo.or.cz was located at Charles University, Prague, CZ +(who generously sponsored connectivity and co-location), with hardware +sponsored by many amazing volunteers from the community +(<a href="@@htmlurl@@/pledge.html">details</a>).</li> + +<li>Until early 2010, repo.or.cz hardware and connectivity was generously +sponsored by UPC.CZ.</ul> <h2>About Girocco</h2> diff --git a/html/pledge.html b/html/pledge.html index 3f7ba0e..9c064b1 100644 --- a/html/pledge.html +++ b/html/pledge.html @@ -4,8 +4,22 @@ <!-- This file is preprocessed by cgi/html.cgi --> +<h2>We are 100% funded</h2> -<p>We are volunteer-run no-income service, and sometimes, we need your help!</p> +<p style="margin: 1em 0em 2em; padding: 1ex 3ex; background-color: #cdf;"> +This is historical information. We're not asking you for money anymore. Thanks +for your interest, though!</p> + +<p>Operation is currently sponsored by the repo.or.cz admin team, and for +tax reasons we want to avoid accidentally generating profit from donations. +Since enforcing a ceiling on donations is tedious, it's really much simpler +if we do not accept any donations in the first place. If you feel really +strongly about supporting us, or even wish to fully sponsor our operation +(and don't expect much more substantial advertisement in return), +<a href="mailto:admin@repo.or.cz">contact us</a> and we'll figure something +out that makes it easy to handle.</p> + +<p>Historical info starts below.</p> <h2>New Hardware Donations Pledge</h2> @@ -91,6 +105,7 @@ plus it will surely make a great CV bullet-point! :) We are sure really cool things could be done by developers with fresh ideas, especially after the hardware upgrade. <a href="volunteers.html">(more details)</a></p> +<!-- <hr /> <h2>Donations</h2> @@ -115,3 +130,4 @@ we will let our users know in case we would badly need some extra money. The current [2010-01-14] repo.or.cz fund balance is <strong>$781</strong>, we will use the money in case of hardware emergency or need to upgrade, or for other strictly repo.or.cz-related expenses.</p> +--> diff --git a/html/sponsoring.html b/html/sponsoring.html new file mode 100644 index 0000000..f989946 --- /dev/null +++ b/html/sponsoring.html @@ -0,0 +1,29 @@ +@section=site guide +@heading=Sponsoring philosophy +@header + +<!-- This file is preprocessed by cgi/html.cgi --> + + +<p>repo.or.cz is sponsored by the people who run it. As the one who started +out paying 100% of the costs when we migrated away from externally sponsored +internet connectivity (though more members of the admin team joined in within +days), please allow me to explain why. + +<p>I find aggressive donation drives really annoying. I don't want to expose +people to more of them unless there really is no other option. I can afford to +keep repo.or.cz running and I don't need anything in return. I don't think +repo.or.cz should need to care about costs, nor should it make any profit. + +<p>I will split costs with people who feel the same way. All people who are +covering part of the cost will be listed here. It will be a small list because +coordinating with more than a few people is tedious. + +<p>If you want to thank us for running repo.or.cz, please do it by paying it +forward: do something nice for someone else. All details are up to you. + +<h2>Contributors to costs of operation</h2> + +<ul> +<li><a href="mailto:jk@jk.gs">Jan Krüger</a> (<code>jast</code> on IRC)</li> +</ul> diff --git a/html/volunteers.html b/html/volunteers.html index 4fde8b2..4f6620f 100644 --- a/html/volunteers.html +++ b/html/volunteers.html @@ -5,9 +5,7 @@ <!-- This file is preprocessed by cgi/html.cgi --> -<p>repo.or.cz is not currently looking for volunteers who would like to help running and developing the site (we had too much feedback!) We are -currently in the process of setting up the first collectively run admin team to -replace Petr Baudis as the sole site maintainer and developer.</p> +<p><em>At this time we are not actively looking for extra volunteers.</em></p> <p>Who do we want:</p> <ul> -- 2.11.4.GIT