From ccf70a1258a8cbb81b66e0e1cea7b5049a8efa07 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 13 Nov 2018 16:36:07 -0500 Subject: [PATCH] removed more old stuff --- citadel/Makefile.in | 6 ++--- citadel/citadel-slapd.conf | 30 --------------------- citadel/citadel_urlshorteners.rc | 25 ------------------ citadel/debian/citadel-server.install | 2 -- citadel/debian/citadel-server.postinst | 4 +-- citadel/include/citadel_dirs.h | 1 - citadel/migrate_aliases.sh | 36 -------------------------- citadel/utillib/citadel_dirs.c | 6 ----- 8 files changed, 3 insertions(+), 107 deletions(-) delete mode 100644 citadel/citadel-slapd.conf delete mode 100644 citadel/citadel_urlshorteners.rc delete mode 100755 citadel/migrate_aliases.sh diff --git a/citadel/Makefile.in b/citadel/Makefile.in index 9ec7b4f42..f1b1407bc 100644 --- a/citadel/Makefile.in +++ b/citadel/Makefile.in @@ -208,7 +208,7 @@ upgrade: install-exec install-doc install-data: $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/messages - @for i in public_clients citadel_urlshorteners.rc \ + @for i in public_clients \ `find $(srcdir)/messages $(srcdir)/network -type f | grep -v .svn`; do \ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \ @@ -221,7 +221,6 @@ install-data: install-data-new: $(srcdir)/mkinstalldirs $(DESTDIR)$(ETC_DIR)/ $(INSTALL_DATA) $(srcdir)/public_clients $(DESTDIR)$(ETC_DIR)/public_clients - $(INSTALL_DATA) $(srcdir)/citadel_urlshorteners.rc $(DESTDIR)$(ETC_DIR)/citadel_urlshorteners.rc $(INSTALL_DATA) $(srcdir)/network/mail.aliases $(DESTDIR)$(ETC_DIR)/mail.aliases $(srcdir)/mkinstalldirs $(DESTDIR)$(STATICDATA_DIR)/messages @@ -273,7 +272,7 @@ install-exec: all $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/unstripped cp $(SERVER_TARGETS) $(DESTDIR)$(prefix)/unstripped/ - @for i in utilsmenu database_cleanup.sh migrate_aliases.sh; do \ + @for i in utilsmenu database_cleanup.sh ; do \ if test -f $(srcdir)/$$i; then \ echo $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \ $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \ @@ -293,7 +292,6 @@ install-exec-new: all fi \ done cp citserver $(DESTDIR)/$(UTILBIN_DIR)/citserver.unstripped - cp migrate_aliases.sh $(DESTDIR)/$(UTILBIN_DIR)/ @for i in $(UTILBIN_TARGETS); do \ if test -f $$i; then \ echo $(INSTALL) $$i $(DESTDIR)/$(UTILBIN_DIR)/$$i; \ diff --git a/citadel/citadel-slapd.conf b/citadel/citadel-slapd.conf deleted file mode 100644 index d4b3cf674..000000000 --- a/citadel/citadel-slapd.conf +++ /dev/null @@ -1,30 +0,0 @@ -# This is a sample OpenLDAP configuration file (usually placed in -# /etc/openldap/slapd.conf) for use with the Citadel LDAP connector. -# -# In this sample, we have a server called "servername.domain.org" and -# we've built our directory tree's Base DN using the components of that -# domain name. You can change this if you'd like. -# -# Once you've got this in place, all you have to do is run slapd, configure -# Citadel to point its LDAP connector at it, and run the IGAB command to -# initialize the directory. - -# A sample schema is included, but you're probably better off -# just going with "schemacheck off" and using whatever schema came with -# your system's slapd. -# -# include /usr/local/citadel/citadel-openldap.schema - -pidfile /usr/local/citadel/openldap-data/slapd.pid -argsfile /usr/local/citadel/openldap-data/slapd.args - -database ldbm -schemacheck off -allow bind_v2 -suffix "dc=servername,dc=domain,dc=org" -rootdn "cn=manager,dc=servername,dc=domain,dc=org" -rootpw secret - -directory /usr/local/citadel/openldap-data - -index objectClass eq diff --git a/citadel/citadel_urlshorteners.rc b/citadel/citadel_urlshorteners.rc deleted file mode 100644 index 72bd628ac..000000000 --- a/citadel/citadel_urlshorteners.rc +++ /dev/null @@ -1,25 +0,0 @@ -# these URLs will be expanded when fetching them from -# RSS-Feeds with short contents (like twitter feeds) -# we expect to find a 30x location header, if we find it, -# we put it in front of that URL, so the full information -# whether one wants to click that or not can be expanded. -http://bit.ly/ -http://krz.ch/ -http://flic.kr/ -http://sns.ly/ -http://wp.me/ -http://ow.ly/ -http://tinyurl.com/ -http://goo.gl/ -http://dld.bz/ -http://tiny.cc/ -http://j.mp/ -http://su.pr/ -#Posting Images to twitter: http://yfrog.com/ -http://t.co/ -http://nblo.gs/ -http://0x4d.ch/ -http://fb.me/ -http://tagi.ch/ -http://post.ly/ -http://aol.it/ diff --git a/citadel/debian/citadel-server.install b/citadel/debian/citadel-server.install index 1676e27f9..da69209d5 100644 --- a/citadel/debian/citadel-server.install +++ b/citadel/debian/citadel-server.install @@ -1,6 +1,5 @@ etc/citadel/mail.aliases etc/citadel/public_clients -etc/citadel/citadel_urlshorteners.rc usr/share/citadel-server/help etc/citadel/messages usr/lib/citadel-server/ctdlmigrate @@ -9,7 +8,6 @@ usr/lib/citadel-server/base64 usr/lib/citadel-server/chkpwd usr/lib/citadel-server/chkpw usr/lib/citadel-server/citserver.unstripped -usr/lib/citadel-server/migrate_aliases.sh usr/lib/citadel-server/aidepost usr/sbin/citmail usr/lib/citadel-server/msgform diff --git a/citadel/debian/citadel-server.postinst b/citadel/debian/citadel-server.postinst index b5227a4c2..b07a655f5 100644 --- a/citadel/debian/citadel-server.postinst +++ b/citadel/debian/citadel-server.postinst @@ -52,10 +52,8 @@ case "$1" in echo -n "applying your settings.... " /usr/lib/citadel-server/setup -q echo "done" - # we're in a fresh install, so we send the welcome message. + # this is a new installation if test -z "$2"; then - echo "migrating mail aliases from other mailers" - /usr/lib/citadel-server/migrate_aliases.sh /etc/citadel/mail.aliases i=0; while test ! -S /var/run/citadel/lmtp.socket -a "$i" -lt "10"; do sleep 1 diff --git a/citadel/include/citadel_dirs.h b/citadel/include/citadel_dirs.h index 8f532dace..6956a2810 100644 --- a/citadel/include/citadel_dirs.h +++ b/citadel/include/citadel_dirs.h @@ -34,7 +34,6 @@ extern char ctdl_utilbin_dir[PATH_MAX]; /* some of the frequently used files */ extern char file_citadel_control[PATH_MAX]; extern char file_citadel_config[PATH_MAX]; -extern char file_citadel_urlshorteners[PATH_MAX]; extern char file_lmtp_socket[PATH_MAX]; extern char file_lmtp_unfiltered_socket[PATH_MAX]; extern char file_arcq[PATH_MAX]; diff --git a/citadel/migrate_aliases.sh b/citadel/migrate_aliases.sh deleted file mode 100755 index bc5c31ef3..000000000 --- a/citadel/migrate_aliases.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -if test -z "$1"; then - echo "Usage: $0 mail.aliases" - exit -fi - -CITALIAS=$1 -if test -f /etc/aliases; then -# don't work with temp fils, so they can't get hijacked. -# sorry users with megabytes of aliases. - NLINES=`cat /etc/aliases | \ - sed -e "s; *;;g" \ - -e "s;\t*;;g" | \ - grep -v ^root: | \ - grep -v ^# | \ - sed -e "s;:root;,room_aide;" \ - -e "s;:;,;" |wc -l` - - for ((i=1; i <= $NLINES; i++)); do - ALIAS=` cat /etc/aliases | \ - sed -e "s; *;;g" \ - -e "s;\t*;;g" | \ - grep -v ^root: | \ - grep -v ^# | \ - sed -e "s;:root;,room_aide;" \ - -e "s;:;,;" |head -n $i |tail -n 1` - ORG=`echo $ALIAS|sed "s;,.*;;"` - if grep "$ORG" "$CITALIAS"; then - echo "Ignoring Alias $ORG as its already there" - else - echo "$ALIAS" >>$CITALIAS - fi - done -else - echo "no /etc/aliases found." -fi \ No newline at end of file diff --git a/citadel/utillib/citadel_dirs.c b/citadel/utillib/citadel_dirs.c index a642ac806..afb2b5441 100644 --- a/citadel/utillib/citadel_dirs.c +++ b/citadel/utillib/citadel_dirs.c @@ -51,7 +51,6 @@ char ctdl_bin_dir[PATH_MAX]=""; /* some of our files, that are needed in several places */ char file_citadel_control[PATH_MAX]=""; char file_citadel_config[PATH_MAX]=""; -char file_citadel_urlshorteners[PATH_MAX]=""; char file_lmtp_socket[PATH_MAX]=""; char file_lmtp_unfiltered_socket[PATH_MAX]=""; char file_arcq[PATH_MAX]=""; @@ -198,11 +197,6 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char *ctdldir, "%scitadel.config", ctdl_autoetc_dir); StripSlashes(file_citadel_config, 0); - snprintf(file_citadel_urlshorteners, - sizeof file_citadel_urlshorteners, - "%scitadel_urlshorteners.rc", - ctdl_etc_dir); - StripSlashes(file_citadel_urlshorteners, 0); snprintf(file_lmtp_socket, sizeof file_lmtp_socket, "%slmtp.socket", -- 2.30.2