diff --git a/Makefile b/Makefile index f755c85d..c059c074 100644 --- a/Makefile +++ b/Makefile @@ -173,9 +173,6 @@ COLL_DEFAULT_CONFIG_FILES := \ config/05-ce-auth-defaults.conf \ config/05-ce-collector-auth.conf -COLL_DEFAULT_MAP_FILES := \ - config/mapfiles.d/50-central-collector.conf - # ------------------------------------------------------------------------------ # HTCondor-CE View files # ------------------------------------------------------------------------------ @@ -340,7 +337,6 @@ collector: client _view install -p -m 0644 -D -t $(DESTDIR)/$(INSTALL_WSGI_DIR)/htcondor-ce/ $(COLL_WSGI_FILES) install -p -m 0644 -D -t $(DESTDIR)/$(INSTALL_SHARE_DIR)/condor-ce/config.d/ $(COLL_DEFAULT_CONFIG_FILES) - install -p -m 0644 -D -t $(DESTDIR)/$(INSTALL_SHARE_DIR)/condor-ce/mapfiles.d/ $(COLL_DEFAULT_MAP_FILES) install: client _view entrypoint collector diff --git a/config/mapfiles.d/50-central-collector.conf b/config/mapfiles.d/50-central-collector.conf deleted file mode 100644 index e6b02d6d..00000000 --- a/config/mapfiles.d/50-central-collector.conf +++ /dev/null @@ -1,10 +0,0 @@ -############################################################################### -# -# HTCondor-CE Central Collector default authentication mappings -# -# DO NOT EDIT THIS FILE! It will be overwritten upon RPM upgrade. -# If you wish to make changes to the HTCondor-CE mappings, create files -# in /etc/condor-ce/mapfiles.d containing your changes. -# -############################################################################### - diff --git a/rpm/htcondor-ce.spec b/rpm/htcondor-ce.spec index 81097c47..8bf5efd3 100644 --- a/rpm/htcondor-ce.spec +++ b/rpm/htcondor-ce.spec @@ -529,7 +529,6 @@ fi %{_datadir}/condor-ce/config.d/01-ce-collector-defaults.conf %{_datadir}/condor-ce/config.d/05-ce-auth-defaults.conf -%{_datadir}/condor-ce/mapfiles.d/50-central-collector.conf %{_datadir}/condor-ce/condor_ce_create_password %{_unitdir}/condor-ce-collector.service