Renaming to uffd-ldapd and cleanup of Debian package

.gitlab-ci.yml

@@ -21,7 +21,7 @@ before_script:
 build:apt:
   extends: .build
   script:
-  - ./debian/create_changelog.py uffd-ldap > debian/changelog
+  - ./debian/create_changelog.py uffd-ldapd > debian/changelog
   - dpkg-buildpackage -us -uc
   - mv ../*.deb ./
   - dpkg-deb -I *.deb
@@ -36,9 +36,9 @@ linter:buster:
   script:
   - pip3 install $PYLINT_PIN pylint-gitlab # this force-updates jinja2 and some other packages!
   - pip3 install -r requirements.txt
-  - python3 -m pylint --exit-zero --rcfile .pylintrc --output-format=pylint_gitlab.GitlabCodeClimateReporter 'server.py' > codeclimate.json
-  - python3 -m pylint --exit-zero --rcfile .pylintrc --output-format=pylint_gitlab.GitlabPagesHtmlReporter 'server.py' > pylint.html
-  - python3 -m pylint --rcfile .pylintrc --output-format=text 'server.py'
+  - python3 -m pylint --exit-zero --rcfile .pylintrc --output-format=pylint_gitlab.GitlabCodeClimateReporter 'uffd-ldapd' > codeclimate.json
+  - python3 -m pylint --exit-zero --rcfile .pylintrc --output-format=pylint_gitlab.GitlabPagesHtmlReporter 'uffd-ldapd' > pylint.html
+  - python3 -m pylint --rcfile .pylintrc --output-format=text 'uffd-ldapd'
   artifacts:
     when: always
     paths:
@@ -52,9 +52,9 @@ linter:bullseye:
   script:
   - pip3 install $PYLINT_PIN pylint-gitlab # this force-updates jinja2 and some other packages!
   - pip3 install -r requirements.txt
-  - python3 -m pylint --exit-zero --rcfile .pylintrc --output-format=pylint_gitlab.GitlabCodeClimateReporter 'server.py' > codeclimate.json
-  - python3 -m pylint --exit-zero --rcfile .pylintrc --output-format=pylint_gitlab.GitlabPagesHtmlReporter 'server.py' > pylint.html
-  - python3 -m pylint --rcfile .pylintrc --output-format=text 'server.py'
+  - python3 -m pylint --exit-zero --rcfile .pylintrc --output-format=pylint_gitlab.GitlabCodeClimateReporter 'uffd-ldapd' > codeclimate.json
+  - python3 -m pylint --exit-zero --rcfile .pylintrc --output-format=pylint_gitlab.GitlabPagesHtmlReporter 'uffd-ldapd' > pylint.html
+  - python3 -m pylint --rcfile .pylintrc --output-format=text 'uffd-ldapd'
   artifacts:
     when: always
     paths:

.pylintrc

@@ -65,6 +65,7 @@ disable=missing-module-docstring,
         missing-function-docstring,
         too-few-public-methods,
         too-many-arguments,
+        invalid-name,
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option

README.md

-LDAP Proxy for Uffd
-===================
+Uffd LDAP Proxy Server
+======================
 
-LDAP server that provides user and group data exposed by uffd's API. Based on python-ldapserver.
+Proxy server to provide uffd user and group data via LDAP.
+Based on [python-ldapserver](https://git.cccv.de/uffd/python-ldapserver).
 
-Requires at least uffd v1.2.0!
+To install uffd-ldapd on Debian, add the [uffd Debian repository](https://packages.cccv.de/uffd/) to `/etc/sources.list` and install the package `uffd-ldapd`.
+Update the config file `/etc/uffd-ldapd.conf` and restart the service with `systemctl restart uffd-ldapd`.
+The proxy server listens on `ldap://127.0.0.1:389/`.
+
+uffd-ldapd requires at least uffd v1.2.0!

debian/contrib/uffd-ldap.service → debian/contrib/uffd-ldapd.service

 [Unit]
-Description=LDAP server to integrate uffd users/groups with LDAP applications
+Description=Proxy server to provide uffd user and group data via LDAP
 After=network.target
-BindsTo=uffd-ldap.socket
+BindsTo=uffd-ldapd.socket
 
 [Service]
-ExecStart=/usr/bin/uffd-ldap --socket-fd 3
+ExecStart=/usr/sbin/uffd-ldapd --socket-fd 3
 
 Restart=always
 RestartSec=10
 StandardOutput=journal
 StandardError=journal
-SyslogIdentifier=uffd-ldap
+SyslogIdentifier=uffd-ldapd
 
 DynamicUser=true
 PrivateUsers=true
@@ -37,7 +37,7 @@ SystemCallArchitectures=native
 SystemCallFilter=@system-service
 MemoryDenyWriteExecute=true
 
-EnvironmentFile=/etc/uffd-ldap.conf
+EnvironmentFile=/etc/uffd-ldapd.conf
 
 [Install]
 WantedBy=default.target

debian/contrib/uffd-ldap.socket → debian/contrib/uffd-ldapd.socket

 [Unit]
-Description=LDAP server to integrate uffd users/groups with LDAP applications
+Description=Proxy server to provide uffd user and group data via LDAP
 
 [Socket]
 ListenStream=127.0.0.1:389

debian/control

-Source: uffd-ldap
+Source: uffd-ldapd
 Section: python
 Priority: optional
 Maintainer: CCCV <it@cccv.de>
 Build-Depends:
  debhelper-compat (= 12),
 Standards-Version: 4.5.0
-Homepage: https://git.cccv.de/uffd/ldap-proxy
-Vcs-Git: https://git.cccv.de/uffd/ldap-proxy.git
+Homepage: https://git.cccv.de/uffd/uffd-ldapd
+Vcs-Git: https://git.cccv.de/uffd/uffd-ldapd.git
 
-Package: uffd-ldap
+Package: uffd-ldapd
 Architecture: all
 Depends:
  ${misc:Depends},
@@ -16,4 +16,4 @@ Depends:
  python3-requests,
  python3-cachecontrol,
  python3-click,
-Description: LDAP server to integrate uffd users/groups with LDAP applications
+Description: Proxy server to provide uffd user and group data via LDAP

debian/install

-server.py /usr/lib/uffd-ldap/
-debian/contrib/uffd-ldap.service /usr/lib/systemd/system/
-debian/contrib/uffd-ldap.socket /usr/lib/systemd/system/
-debian/contrib/uffd-ldap.conf /etc/
+uffd-ldapd /usr/sbin/
+debian/contrib/uffd-ldapd.service /usr/lib/systemd/system/
+debian/contrib/uffd-ldapd.socket /usr/lib/systemd/system/
+debian/contrib/uffd-ldapd.conf /etc/

debian/links

-/usr/lib/uffd-ldap/server.py /usr/bin/uffd-ldap

debian/postinst

@@ -4,7 +4,7 @@ set -e
 
 case "$1" in
 	configure)
-		chmod 0640 /etc/uffd-ldap.conf
+		chmod 0640 /etc/uffd-ldapd.conf
 	;;
 
 	abort-upgrade|abort-remove|abort-deconfigure)