From 233e868895f6a130bf825f087f4efdcf74f37ee3 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 2 Apr 2021 14:36:15 +0200 Subject: [PATCH] CONTRIB: move some admin-related sub-projects to admin/ The following components were moved to admin/ because they're generally used in field by admins: iprange/ netsnmp-perl/ selinux/ systemd/ wireshark-dissectors/ syntax-highlight/ release-estimator/ --- MAINTAINERS | 2 +- Makefile | 5 +++-- {contrib => admin}/iprange/Makefile | 0 {contrib => admin}/iprange/ip6range.c | 0 {contrib => admin}/iprange/iprange.c | 0 {contrib => admin}/netsnmp-perl/README | 0 .../netsnmp-perl/cacti_data_query_haproxy_backends.xml | 0 .../netsnmp-perl/cacti_data_query_haproxy_frontends.xml | 0 {contrib => admin}/netsnmp-perl/haproxy.pl | 0 {contrib => admin}/netsnmp-perl/haproxy_backend.xml | 0 {contrib => admin}/netsnmp-perl/haproxy_frontend.xml | 0 {contrib => admin}/netsnmp-perl/haproxy_socket.xml | 0 {contrib => admin}/release-estimator/README.md | 0 {contrib => admin}/release-estimator/release-estimator.py | 0 {contrib => admin}/selinux/README | 0 {contrib => admin}/selinux/haproxy.fc | 0 {contrib => admin}/selinux/haproxy.if | 0 {contrib => admin}/selinux/haproxy.te | 0 {contrib => admin}/syntax-highlight/haproxy.vim | 0 {contrib => admin}/systemd/Makefile | 0 {contrib => admin}/systemd/haproxy.service.in | 0 {contrib => admin}/wireshark-dissectors/peers/Makefile | 0 {contrib => admin}/wireshark-dissectors/peers/README | 0 {contrib => admin}/wireshark-dissectors/peers/packet-happp.c | 0 .../peers/wireshark.happp.dissector.patch | 0 25 files changed, 4 insertions(+), 3 deletions(-) rename {contrib => admin}/iprange/Makefile (100%) rename {contrib => admin}/iprange/ip6range.c (100%) rename {contrib => admin}/iprange/iprange.c (100%) rename {contrib => admin}/netsnmp-perl/README (100%) rename {contrib => admin}/netsnmp-perl/cacti_data_query_haproxy_backends.xml (100%) rename {contrib => admin}/netsnmp-perl/cacti_data_query_haproxy_frontends.xml (100%) rename {contrib => admin}/netsnmp-perl/haproxy.pl (100%) rename {contrib => admin}/netsnmp-perl/haproxy_backend.xml (100%) rename {contrib => admin}/netsnmp-perl/haproxy_frontend.xml (100%) rename {contrib => admin}/netsnmp-perl/haproxy_socket.xml (100%) rename {contrib => admin}/release-estimator/README.md (100%) rename {contrib => admin}/release-estimator/release-estimator.py (100%) rename {contrib => admin}/selinux/README (100%) rename {contrib => admin}/selinux/haproxy.fc (100%) rename {contrib => admin}/selinux/haproxy.if (100%) rename {contrib => admin}/selinux/haproxy.te (100%) rename {contrib => admin}/syntax-highlight/haproxy.vim (100%) rename {contrib => admin}/systemd/Makefile (100%) rename {contrib => admin}/systemd/haproxy.service.in (100%) rename {contrib => admin}/wireshark-dissectors/peers/Makefile (100%) rename {contrib => admin}/wireshark-dissectors/peers/README (100%) rename {contrib => admin}/wireshark-dissectors/peers/packet-happp.c (100%) rename {contrib => admin}/wireshark-dissectors/peers/wireshark.happp.dissector.patch (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 1e9c29fee8..2497a36810 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -95,7 +95,7 @@ Files: src/pattern.c, include/haproxy/pattern*.h Master-worker Maintainer: William Lallemand -Note: Please CC William when touching src/haproxy.c and contrib/systemd +Note: Please CC William when touching src/haproxy.c and admin/systemd Multi-threading Maintainer: Christopher Faulet diff --git a/Makefile b/Makefile index 452ab8d4d5..53cfc9d970 100644 --- a/Makefile +++ b/Makefile @@ -994,10 +994,11 @@ uninstall: clean: $(Q)rm -f *.[oas] src/*.[oas] haproxy test .build_opts .build_opts.new - $(Q)for dir in . src dev/* include/* doc; do rm -f $$dir/*~ $$dir/*.rej $$dir/core; done + $(Q)for dir in . src dev/* admin/* include/* doc; do rm -f $$dir/*~ $$dir/*.rej $$dir/core; done $(Q)rm -f haproxy-$(VERSION).tar.gz haproxy-$(VERSION)$(SUBVERS)$(EXTRAVERSION).tar.gz $(Q)rm -f haproxy-$(VERSION) haproxy-$(VERSION)$(SUBVERS)$(EXTRAVERSION) nohup.out gmon.out - $(Q)rm -f {dev,contrib}/*/*.[oas] {dev,contrib}/*/*/*.[oas] {dev,contrib}/*/*/*/*.[oas] + $(Q)rm -f {admin,dev,contrib}/*/*.[oas] {admin,dev,contrib}/*/*/*.[oas] {admin,dev,contrib}/*/*/*/*.[oas] + $(Q)rm -f admin/iprange/iprange admin/iprange/ip6range $(Q)rm -f contrib/halog/halog dev/flags/flags dev/poll/poll dev/tcploop/tcploop $(Q)rm -f dev/hpack/decode dev/hpack/gen-enc dev/hpack/gen-rht diff --git a/contrib/iprange/Makefile b/admin/iprange/Makefile similarity index 100% rename from contrib/iprange/Makefile rename to admin/iprange/Makefile diff --git a/contrib/iprange/ip6range.c b/admin/iprange/ip6range.c similarity index 100% rename from contrib/iprange/ip6range.c rename to admin/iprange/ip6range.c diff --git a/contrib/iprange/iprange.c b/admin/iprange/iprange.c similarity index 100% rename from contrib/iprange/iprange.c rename to admin/iprange/iprange.c diff --git a/contrib/netsnmp-perl/README b/admin/netsnmp-perl/README similarity index 100% rename from contrib/netsnmp-perl/README rename to admin/netsnmp-perl/README diff --git a/contrib/netsnmp-perl/cacti_data_query_haproxy_backends.xml b/admin/netsnmp-perl/cacti_data_query_haproxy_backends.xml similarity index 100% rename from contrib/netsnmp-perl/cacti_data_query_haproxy_backends.xml rename to admin/netsnmp-perl/cacti_data_query_haproxy_backends.xml diff --git a/contrib/netsnmp-perl/cacti_data_query_haproxy_frontends.xml b/admin/netsnmp-perl/cacti_data_query_haproxy_frontends.xml similarity index 100% rename from contrib/netsnmp-perl/cacti_data_query_haproxy_frontends.xml rename to admin/netsnmp-perl/cacti_data_query_haproxy_frontends.xml diff --git a/contrib/netsnmp-perl/haproxy.pl b/admin/netsnmp-perl/haproxy.pl similarity index 100% rename from contrib/netsnmp-perl/haproxy.pl rename to admin/netsnmp-perl/haproxy.pl diff --git a/contrib/netsnmp-perl/haproxy_backend.xml b/admin/netsnmp-perl/haproxy_backend.xml similarity index 100% rename from contrib/netsnmp-perl/haproxy_backend.xml rename to admin/netsnmp-perl/haproxy_backend.xml diff --git a/contrib/netsnmp-perl/haproxy_frontend.xml b/admin/netsnmp-perl/haproxy_frontend.xml similarity index 100% rename from contrib/netsnmp-perl/haproxy_frontend.xml rename to admin/netsnmp-perl/haproxy_frontend.xml diff --git a/contrib/netsnmp-perl/haproxy_socket.xml b/admin/netsnmp-perl/haproxy_socket.xml similarity index 100% rename from contrib/netsnmp-perl/haproxy_socket.xml rename to admin/netsnmp-perl/haproxy_socket.xml diff --git a/contrib/release-estimator/README.md b/admin/release-estimator/README.md similarity index 100% rename from contrib/release-estimator/README.md rename to admin/release-estimator/README.md diff --git a/contrib/release-estimator/release-estimator.py b/admin/release-estimator/release-estimator.py similarity index 100% rename from contrib/release-estimator/release-estimator.py rename to admin/release-estimator/release-estimator.py diff --git a/contrib/selinux/README b/admin/selinux/README similarity index 100% rename from contrib/selinux/README rename to admin/selinux/README diff --git a/contrib/selinux/haproxy.fc b/admin/selinux/haproxy.fc similarity index 100% rename from contrib/selinux/haproxy.fc rename to admin/selinux/haproxy.fc diff --git a/contrib/selinux/haproxy.if b/admin/selinux/haproxy.if similarity index 100% rename from contrib/selinux/haproxy.if rename to admin/selinux/haproxy.if diff --git a/contrib/selinux/haproxy.te b/admin/selinux/haproxy.te similarity index 100% rename from contrib/selinux/haproxy.te rename to admin/selinux/haproxy.te diff --git a/contrib/syntax-highlight/haproxy.vim b/admin/syntax-highlight/haproxy.vim similarity index 100% rename from contrib/syntax-highlight/haproxy.vim rename to admin/syntax-highlight/haproxy.vim diff --git a/contrib/systemd/Makefile b/admin/systemd/Makefile similarity index 100% rename from contrib/systemd/Makefile rename to admin/systemd/Makefile diff --git a/contrib/systemd/haproxy.service.in b/admin/systemd/haproxy.service.in similarity index 100% rename from contrib/systemd/haproxy.service.in rename to admin/systemd/haproxy.service.in diff --git a/contrib/wireshark-dissectors/peers/Makefile b/admin/wireshark-dissectors/peers/Makefile similarity index 100% rename from contrib/wireshark-dissectors/peers/Makefile rename to admin/wireshark-dissectors/peers/Makefile diff --git a/contrib/wireshark-dissectors/peers/README b/admin/wireshark-dissectors/peers/README similarity index 100% rename from contrib/wireshark-dissectors/peers/README rename to admin/wireshark-dissectors/peers/README diff --git a/contrib/wireshark-dissectors/peers/packet-happp.c b/admin/wireshark-dissectors/peers/packet-happp.c similarity index 100% rename from contrib/wireshark-dissectors/peers/packet-happp.c rename to admin/wireshark-dissectors/peers/packet-happp.c diff --git a/contrib/wireshark-dissectors/peers/wireshark.happp.dissector.patch b/admin/wireshark-dissectors/peers/wireshark.happp.dissector.patch similarity index 100% rename from contrib/wireshark-dissectors/peers/wireshark.happp.dissector.patch rename to admin/wireshark-dissectors/peers/wireshark.happp.dissector.patch