From 6c169ab3a1ad8f3b8a242352cdf66f53e3d3663f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= <timothee.floure@posteo.net>
Date: Wed, 30 Oct 2019 12:21:16 +0100
Subject: [PATCH] Rename from unipoly-mlmmj-ldap-sync to mlmmj-ldap-sync

---
 Makefile                                             |  6 +++---
 debian/changelog                                     |  7 +++++++
 debian/control                                       | 12 ++++++------
 unipoly-mlmmj-ldap-sync => mlmmj-ldap-sync           |  2 +-
 mlmmj-ldap-sync.service                              |  7 +++++++
 ...ly-mlmmj-ldap-sync.timer => mlmmj-ldap-sync.timer |  2 +-
 unipoly-mlmmj-ldap-sync.service                      |  7 -------
 7 files changed, 25 insertions(+), 18 deletions(-)
 rename unipoly-mlmmj-ldap-sync => mlmmj-ldap-sync (98%)
 create mode 100644 mlmmj-ldap-sync.service
 rename unipoly-mlmmj-ldap-sync.timer => mlmmj-ldap-sync.timer (52%)
 delete mode 100644 unipoly-mlmmj-ldap-sync.service

diff --git a/Makefile b/Makefile
index 184398b..a299bf4 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,6 @@ build:
 
 install:
 	mkdir -p $(DESTDIR)$(PREFIX)/bin /etc /lib/systemd/system
-	install -m755 unipoly-mlmmj-ldap-sync $(DESTDIR)$(PREFIX)/bin/unipoly-mlmmj-ldap-sync
-	install -m644 conf.example.toml /etc/unipoly-mlmmj-ldap-sync.toml
-	install -m644 unipoly-mlmmj-ldap-sync.service unipoly-mlmmj-ldap-sync.timer /lib/systemd/system
+	install -m755 mlmmj-ldap-sync $(DESTDIR)$(PREFIX)/bin/mlmmj-ldap-sync
+	install -m644 conf.example.toml /etc/mlmmj-ldap-sync.toml
+	install -m644 mlmmj-ldap-sync.service mlmmj-ldap-sync.timer /lib/systemd/system
diff --git a/debian/changelog b/debian/changelog
index cb63333..c00a2dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mlmmj-ldap-sync (0.5) unstable; urgency=medium
+
+  * Rename package from unipoly-mlmmj-ldap-sync to mlmmj-ldap-sync.
+  * Allow multiple configurations.
+
+ -- Timothée Floure <timothee.floure@epfl.ch>  Wed, 30 Oct 2019 12:20:01 +0100
+
 unipoly-mlmmj-ldap-sync (0.4) unstable; urgency=medium
 
   * Fix typo in remove_subscriber_from
diff --git a/debian/control b/debian/control
index 36242ce..dea5ed9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,15 @@
-Source: unipoly-mlmmj-ldap-sync
+Source: mlmmj-ldap-sync
 Section: admin
 Priority: optional
 Maintainer: Timothée Floure <timothee.floure@epfl.ch>
 Build-Depends: debhelper (>= 9)
 Standards-Version: 4.1.1
-Homepage: https://gitlab.gnugen.ch/gnugen-externs/unipoly/mlmmj-ldap-sync
-Vcs-Git: git://gitlab.gnugen.ch/gnugen-extenrs/unipoly/mlmmj-ldap-sync.git
+Homepage: https://gitlab.gnugen.ch/gnugen/mlmmj-ldap-sync
+Vcs-Git: git://gitlab.gnugen.ch/gnugen/mlmmj-ldap-sync.git
 
 Package: unipoly-mlmmj-ldap-sync
 Architecture: all
 Depends: ruby, ruby-net-ldap, ruby-toml, ${misc:Depends}
-Description: Cronjobs to maintain the synchronization of Unipoly's mailing lists.
- This package installs cronjobs to maintain the synchronization between
- unipoly's LDAP tree and mailing lists.
+Description: Cronjobs to maintain the synchronization of mlmmj mailing lists.
+ This package installs cronjobs to maintain the synchronization between LDAP
+ groups and mailing lists.
diff --git a/unipoly-mlmmj-ldap-sync b/mlmmj-ldap-sync
similarity index 98%
rename from unipoly-mlmmj-ldap-sync
rename to mlmmj-ldap-sync
index d3f8d5c..3c98a36 100755
--- a/unipoly-mlmmj-ldap-sync
+++ b/mlmmj-ldap-sync
@@ -4,7 +4,7 @@ require 'toml'
 require 'net/ldap'
 require 'English'
 
-@configuration_file = '/etc/unipoly-mlmmj-ldap-sync.toml'
+@configuration_file = '/etc/mlmmj-ldap-sync.toml'
 @configuration = nil
 
 def read_configuration(path)
diff --git a/mlmmj-ldap-sync.service b/mlmmj-ldap-sync.service
new file mode 100644
index 0000000..ac0ecaf
--- /dev/null
+++ b/mlmmj-ldap-sync.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Synchronize mlmmj mailing lists with LDAP groups
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/mlmmj-ldap-sync
diff --git a/unipoly-mlmmj-ldap-sync.timer b/mlmmj-ldap-sync.timer
similarity index 52%
rename from unipoly-mlmmj-ldap-sync.timer
rename to mlmmj-ldap-sync.timer
index 4ec67c9..3b99c39 100644
--- a/unipoly-mlmmj-ldap-sync.timer
+++ b/mlmmj-ldap-sync.timer
@@ -1,5 +1,5 @@
 [Unit]
-Description=Synchronize Unipoly's mailing lists with their LDAP groups once a day
+Description=Synchronize mlmmj mailing lists with LDAP groups once a day
 
 [Timer]
 OnCalendar=*-*-* 3:00:00
diff --git a/unipoly-mlmmj-ldap-sync.service b/unipoly-mlmmj-ldap-sync.service
deleted file mode 100644
index f82c859..0000000
--- a/unipoly-mlmmj-ldap-sync.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Synchronize Unipoly's mailing lists with their LDAP groups
-After=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/unipoly-mlmmj-ldap-sync