add dontdelete to parameters, list address <> fqdn

Author: joergmschulz

docker-compose.yml

@@ -20,6 +20,8 @@ services:
       - LDAP_PASSWORD=${LDAP_PASSWORD}
       - LDAP_HOSTNAME=${LDAP_HOSTNAME}
       - MM3SYNC_PREFERRED_LANGUAGE=${MM3SYNC_PREFERRED_LANGUAGE:-de}
+      - MM3SYNC_DELETE_REST_LIST=${MM3SYNC_DELETE_REST_LIST:-false} 
+      - MM3SYNC_DONT_DELETE=${MM3SYNC_DONT_DELETE}
     networks:
       services:
         ipv4_address: ${MM3SYNC_IP}

m3_sync.py

@@ -171,7 +171,7 @@ def main(self):
         # find group
         ret_attr = [
             self.sync['group_name_attr'], self.sync['subscriber_attr'], 
-            self.sync['owner_attr'], self.sync['moderator_attr'], "cn", "description"
+            self.sync['owner_attr'], self.sync['moderator_attr'], "cn", "description", self.sync['mail_attr']
         ]
         search_result = self.ldap.search(
             self.sync['search_base'],
@@ -241,7 +241,8 @@ def main(self):
             self.logger.info("Create list {0} in domain {1}".format(
                 list_name, self.sync['default_list_domain']))
             try:
-                mlist = domain.create_list(list_name)
+                # create list by listname or by email address
+                mlist = domain.create_list(len(str(datas['mail']))>0 ?  datas['mail'] : list_name)
                 self.set_settings(mlist)
             except HTTPError as e:
                 print(e)
@@ -252,7 +253,7 @@ def main(self):
                     self.logger.warn("Failed to add list {0}".format(list_name))
                     continue
 
-            mlist_name = mlist.fqdn_listname
+            mlist_name = mlist.fqdn_listname # important to use this and not the list name
 
             # add domain as accepted non-member
             if '@' in self.sync['accept_nonmembers'] :
@@ -316,8 +317,8 @@ def main(self):
             if list_name not in ldap_data.keys():
 
                 if self.sync['delete_rest_list'] == 'true':
-
-
+                    if os.environ.get('DEBUG_DEVELOP') == 'true':
+                    pdb.set_trace()
                     # some are excluded using regex pattern
                     if self.sync['exclude_list_re'] and re.search(r'{0}'.format(self.sync['exclude_list_re']), mlist.list_name):
                         continue