From 6dfbb119f7cee23d8e071a1788f187b783a5d261 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Wed, 20 Apr 2016 14:31:42 +0200 Subject: [PATCH] net/haproxy: cleanup --- net/haproxy/+POST_DEINSTALL | 3 --- .../OPNsense/HAProxy => etc/inc/plugins.inc.d}/haproxy.inc | 1 - .../src/opnsense/service/templates/OPNsense/HAProxy/+TARGETS | 2 -- .../templates/OPNsense/HAProxy => www}/diag_logs_haproxy.php | 0 4 files changed, 6 deletions(-) delete mode 100644 net/haproxy/+POST_DEINSTALL rename net/haproxy/src/{opnsense/service/templates/OPNsense/HAProxy => etc/inc/plugins.inc.d}/haproxy.inc (97%) rename net/haproxy/src/{opnsense/service/templates/OPNsense/HAProxy => www}/diag_logs_haproxy.php (100%) diff --git a/net/haproxy/+POST_DEINSTALL b/net/haproxy/+POST_DEINSTALL deleted file mode 100644 index fa55fa709..000000000 --- a/net/haproxy/+POST_DEINSTALL +++ /dev/null @@ -1,3 +0,0 @@ -# remove legacy components on uninstall -rm -f /usr/local/www/diag_logs_haproxy.php -rm -f /usr/local/etc/inc/plugins.inc.d/haproxy.inc diff --git a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.inc b/net/haproxy/src/etc/inc/plugins.inc.d/haproxy.inc similarity index 97% rename from net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.inc rename to net/haproxy/src/etc/inc/plugins.inc.d/haproxy.inc index fd9af8723..89ed9eb15 100644 --- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.inc +++ b/net/haproxy/src/etc/inc/plugins.inc.d/haproxy.inc @@ -2,7 +2,6 @@ /** * Copyright (C) 2016 Frank Wall - * Copyright (C) 2014-2016 Franco Fichtner * * All rights reserved. * diff --git a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/+TARGETS b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/+TARGETS index fee417f6f..6e4c913d2 100644 --- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/+TARGETS +++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/+TARGETS @@ -1,4 +1,2 @@ -diag_logs_haproxy.php:/usr/local/www/diag_logs_haproxy.php haproxy.conf:/usr/local/etc/haproxy.conf -haproxy.inc:/usr/local/etc/inc/plugins.inc.d/haproxy.inc rc.conf.d:/etc/rc.conf.d/haproxy diff --git a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/diag_logs_haproxy.php b/net/haproxy/src/www/diag_logs_haproxy.php similarity index 100% rename from net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/diag_logs_haproxy.php rename to net/haproxy/src/www/diag_logs_haproxy.php