... | ... | @@ -1325,6 +1325,41 @@ reasons: |
|
|
then ([Puppet](https://en.wikipedia.org/wiki/Puppet_(software)) was created in 2005, only [cfengine](https://en.wikipedia.org/wiki/CFEngine) existed
|
|
|
back then, which was created in 1993)
|
|
|
|
|
|
* **difficult to customize**: Tor-specific customizations are made as
|
|
|
patches to the git repository and require a package rebuild. they
|
|
|
are therefore difficult to merge back upstream and require us to
|
|
|
run our own fork.
|
|
|
|
|
|
Our version of ud-ldap has therefore diverged from upstream. The
|
|
|
changes are not extensive, but they are still present and require a
|
|
|
merge every time we want to upgrade the package. At the time of
|
|
|
writing, it is:
|
|
|
|
|
|
anarcat@curie:userdir-ldap(master)$ git diff --stat f1e89a3
|
|
|
debian/changelog | 18 ++++++++++++++++++
|
|
|
debian/rules | 2 +-
|
|
|
debian/ud-replicate.cron.d | 2 +-
|
|
|
templates/welcome-message | 41 ++++++++++++++++++++++++++++-------------
|
|
|
ud-generate | 3 ---
|
|
|
ud-mailgate | 2 ++
|
|
|
ud-replicate | 2 +-
|
|
|
userdir-ldap-slapd.conf.in | 4 ++--
|
|
|
userdir-ldap.conf | 2 +-
|
|
|
userdir-ldap.schema | 9 ++++++++-
|
|
|
10 files changed, 62 insertions(+), 23 deletions(-)
|
|
|
|
|
|
It seems that upstream doesn't necessarily run released code, and we
|
|
|
certainly don't: the above merge point had 47 commits on top of the
|
|
|
previous release (0.3.96). The current release, as of october 2020, is
|
|
|
0.3.97, and upstream already has 14 commits on top of it.
|
|
|
|
|
|
The web interface is in a similar conendrum, except worse:
|
|
|
|
|
|
22 files changed, 192 insertions(+), 648 deletions(-)
|
|
|
|
|
|
At least the changes there are only on the HTML templates. The merge
|
|
|
task is tracked in [issue 40062](https://gitlab.torproject.org/tpo/tpa/team/-/issues/40062).
|
|
|
|
|
|
## Goals
|
|
|
|
|
|
The goal of the current discussion would be to find a way to fix the
|
... | ... | |