netbird/plugins
0
0
Fork 0
mirror of https://github.com/netbirdio/plugins.git synced 2026-05-22 18:44:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into haproxy_live_cert_update

Browse Source 
# Conflicts:
#	net/haproxy/src/opnsense/service/conf/actions.d/actions_haproxy.conf
This commit is contained in:
Andreas Stuerz
2021-02-23 11:54:54 +01:00
parent 7231fcfa0d 5f70df6b3a
commit 1654bd1f2c
119 changed files with 941 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LICENSE
+2 -1
View File
@@ -1,4 +1,5 @@
Copyright (c) 2015-2020 Ad Schellevis <ad@opnsense.org>
Copyright (c) 2021 Andreas Stuerz
Copyright (c) 2019 Cloudfence - Julio Camargo (JCC)
Copyright (c) 2005-2006 Colin Smith <ethethlay@gmail.com>
Copyright (c) 2020 D. Domig
@@ -23,7 +24,7 @@ Copyright (c) 2020 Marc Leuser
Copyright (c) 2020 Martin Wasley
Copyright (c) 2017-2020 Michael Muenz <m.muenz@gmail.com>
Copyright (c) 2004-2012 Scott Ullrich <sullrich@gmail.com>
Copyright (c) 2010-2012 Seth Mos <seth.mos@dds.nl>
Copyright (c) 2010 Seth Mos <seth.mos@dds.nl>
Copyright (c) 2008 Shrew Soft Inc. <mgrooms@shrew.net>
Copyright (c) 2017-2019 Smart-Soft
Copyright (c) 2013 Stanley P. Miller \ stan-qaz
Makefile
+1 -1
View File
@@ -43,7 +43,7 @@ list:
.endfor
# shared targets that are sane to run from the root directory
TARGETS= clean lint style style-fix style-python sweep test
TARGETS= clean lint revision style style-fix style-python sweep test
.for TARGET in ${TARGETS}
${TARGET}:
Mk/defaults.mk
+13 -2
View File
@@ -26,9 +26,14 @@
LOCALBASE?= /usr/local
PAGER?= less
PKG!= which pkg || echo true
PKG= ${LOCALBASE}/sbin/pkg
.if ! exists(${PKG})
PKG= true
.endif
GIT!= which git || echo true
GITVERSION= ${SCRIPTSDIR}/version.sh
_PLUGIN_ARCH!= uname -p
PLUGIN_ARCH?= ${_PLUGIN_ARCH}
@@ -64,7 +69,13 @@ PLUGIN_PYTHON?= 37
REPLACEMENTS= PLUGIN_ABI \
PLUGIN_ARCH \
PLUGIN_FLAVOUR
PLUGIN_FLAVOUR \
PLUGIN_HASH \
PLUGIN_MAINTAINER \
PLUGIN_NAME \
PLUGIN_PKGNAME \
PLUGIN_PKGVERSION \
PLUGIN_WWW
SED_REPLACE= # empty
Mk/plugins.mk
+24 -10
View File
@@ -1,4 +1,4 @@
# Copyright (c) 2015-2020 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2015-2021 Franco Fichtner <franco@opnsense.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -27,13 +27,22 @@ all: check
.include "defaults.mk"
PLUGINSDIR?= ${.CURDIR}/../..
SCRIPTSDIR= ${PLUGINSDIR}/Scripts
TEMPLATESDIR= ${PLUGINSDIR}/Templates
.if exists(${GIT}) && exists(${GITVERSION})
PLUGIN_COMMIT!= ${GITVERSION}
.else
PLUGIN_COMMIT= unknown 0 undefined
.endif
PLUGIN_HASH?= ${PLUGIN_COMMIT:[3]}
PLUGIN_DESC= pkg-descr
PLUGIN_SCRIPTS= +PRE_INSTALL +POST_INSTALL \
+PRE_DEINSTALL +POST_DEINSTALL
PLUGINSDIR= ${.CURDIR}/../..
TEMPLATESDIR= ${PLUGINSDIR}/Templates
PLUGIN_WWW?= https://opnsense.org/
PLUGIN_REVISION?= 0
@@ -183,7 +192,7 @@ install: check
mv "${DESTDIR}${LOCALBASE}/$${FILE}" "${DESTDIR}${LOCALBASE}/$${FILE%%.in}"; \
fi; \
done
@echo "${PLUGIN_PKGVERSION}" > "${DESTDIR}${LOCALBASE}/opnsense/version/${PLUGIN_NAME}"
@cat ${TEMPLATESDIR}/version | sed ${SED_REPLACE} > "${DESTDIR}${LOCALBASE}/opnsense/version/${PLUGIN_NAME}"
plist: check
@(cd ${.CURDIR}/src; find * -type f) | while read FILE; do \
@@ -237,6 +246,8 @@ package: check
@echo -n ">>> Staging files for ${PLUGIN_PKGNAME}-${PLUGIN_PKGVERSION}..."
@${MAKE} DESTDIR=${WRKSRC} install
@echo " done"
@echo ">>> Generated version info for ${PLUGIN_PKGNAME}-${PLUGIN_PKGVERSION}:"
@cat ${WRKSRC}/usr/local/opnsense/version/${PLUGIN_NAME}
@echo ">>> Packaging files for ${PLUGIN_PKGNAME}-${PLUGIN_PKGVERSION}:"
@${PKG} create -v -m ${WRKSRC} -r ${WRKSRC} \
-p ${WRKSRC}/plist -o ${PKGDIR}
@@ -297,7 +308,7 @@ lint-php: check
! -name "*.xml" ! -name "*.xml.sample" ! -name "*.eot" \
! -name "*.svg" ! -name "*.woff" ! -name "*.woff2" \
! -name "*.otf" ! -name "*.png" ! -name "*.js" ! -name "*.md" \
! -name "*.scss" ! -name "*.py" ! -name "*.ttf" \
! -name "*.scss" ! -name "*.py" ! -name "*.ttf" ! -name "*.txz" \
! -name "*.tgz" ! -name "*.xml.dist" ! -name "*.sh" \
-type f -print0 | xargs -0 -n1 php -l
@@ -312,9 +323,12 @@ sweep: check
fi
find ${.CURDIR}/src ! -name "*.min.*" ! -name "*.svg" \
! -name "*.ser" -type f -print0 | \
xargs -0 -n1 ${.CURDIR}/../../Scripts/cleanfile
xargs -0 -n1 ${SCRIPTSDIR}/cleanfile
find ${.CURDIR} -type f -depth 1 -print0 | \
xargs -0 -n1 ${.CURDIR}/../../Scripts/cleanfile
xargs -0 -n1 ${SCRIPTSDIR}/cleanfile
revision:
@${SCRIPTSDIR}/revbump.sh ${.CURDIR}
STYLEDIRS?= src/etc/inc src/opnsense
@@ -322,7 +336,7 @@ style: check
@: > ${.CURDIR}/.style.out
.for STYLEDIR in ${STYLEDIRS}
@if [ -d ${.CURDIR}/${STYLEDIR} ]; then \
(phpcs --standard=${.CURDIR}/../../ruleset.xml \
(phpcs --standard=${PLUGINSDIR}/ruleset.xml \
${.CURDIR}/${STYLEDIR} || true) > \
${.CURDIR}/.style.out; \
fi
@@ -337,7 +351,7 @@ style: check
style-fix: check
.for STYLEDIR in ${STYLEDIRS}
@if [ -d ${.CURDIR}/${STYLEDIR} ]; then \
phpcbf --standard=${.CURDIR}/../../ruleset.xml \
phpcbf --standard=${PLUGINSDIR}/ruleset.xml \
${.CURDIR}/${STYLEDIR} || true; \
fi
.endfor
Scripts/revbump.sh
Executable
+17
View File
@@ -0,0 +1,17 @@
#!/bin/sh
set -e
DIR=${1}
if [ -z "${DIR}" ]; then
DIR=.
fi
REV=$(make -C ${DIR} -V PLUGIN_REVISION)
REV=$(expr ${REV} \+ 1)
grep -v ^PLUGIN_REVISION ${DIR}/Makefile > ${DIR}/Makefile.tmp
sed -e "s/^\(PLUGIN_VERSION.*\)/\1%PLUGIN_REVISION= ${REV}/g" \
${DIR}/Makefile.tmp | tr '%' '\n' > ${DIR}/Makefile
rm -f ${DIR}/Makefile.tmp
Scripts/version.sh
Executable
+34
View File
@@ -0,0 +1,34 @@
#!/bin/sh
# Copyright (c) 2015 Franco Fichtner <franco@opnsense.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
set -e
VERSION=$(git describe --abbrev=0 --always ${1})
REVISION=$(git rev-list ${VERSION}.. --count)
HASH=$(git rev-list HEAD --max-count=1 | cut -c1-9)
echo ${VERSION} ${REVISION} ${HASH}
Templates/version
+11
View File
@@ -0,0 +1,11 @@
{
"product_abi": "%%PLUGIN_ABI%%",
"product_arch": "%%PLUGIN_ARCH%%",
"product_email": "%%PLUGIN_MAINTAINER%%",
"product_flavour": "%%PLUGIN_FLAVOUR%%",
"product_hash": "%%PLUGIN_HASH%%",
"product_id": "%%PLUGIN_PKGNAME%%",
"product_name": "%%PLUGIN_NAME%%",
"product_version": "%%PLUGIN_PKGVERSION%%",
"product_website": "%%PLUGIN_WWW%%"
}
benchmarks/iperf/Makefile
+1
View File
@@ -1,5 +1,6 @@
PLUGIN_NAME= iperf
PLUGIN_VERSION= 1.0
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Connection speed tester
PLUGIN_DEPENDS= iperf3 ruby
PLUGIN_MAINTAINER= franz.fabian.94@gmail.com
databases/redis/Makefile
+1
View File
@@ -1,5 +1,6 @@
PLUGIN_NAME= redis
PLUGIN_VERSION= 1.1
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Redis DB
PLUGIN_DEPENDS= redis
PLUGIN_MAINTAINER= franz.fabian.94@gmail.com
devel/debug/Makefile
+1
View File
@@ -1,5 +1,6 @@
PLUGIN_NAME= debug
PLUGIN_VERSION= 1.3
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Debugging Tools
PLUGIN_DEPENDS= php${PLUGIN_PHP}-pear-PHP_CodeSniffer \
php${PLUGIN_PHP}-pecl-xdebug \
devel/grid_example/Makefile
+1
View File
@@ -1,5 +1,6 @@
PLUGIN_NAME= grid_example
PLUGIN_VERSION= 1.0
PLUGIN_REVISION= 1
PLUGIN_COMMENT= A sample framework application
PLUGIN_MAINTAINER= ad@opnsense.org
devel/helloworld/Makefile
+1
View File
@@ -1,5 +1,6 @@
PLUGIN_NAME= helloworld
PLUGIN_VERSION= 1.3
PLUGIN_REVISION= 1
PLUGIN_COMMENT= A sample framework application
PLUGIN_MAINTAINER= ad@opnsense.org
dns/bind/Makefile
+1
View File
@@ -1,5 +1,6 @@
PLUGIN_NAME= bind
PLUGIN_VERSION= 1.16
PLUGIN_REVISION= 1
PLUGIN_COMMENT= BIND domain name service
PLUGIN_DEPENDS= bind916
PLUGIN_MAINTAINER= m.muenz@gmail.com
dns/dnscrypt-proxy/Makefile
+1 -1
View File
@@ -1,6 +1,6 @@
PLUGIN_NAME= dnscrypt-proxy
PLUGIN_VERSION= 1.8
PLUGIN_REVISIOM= 1
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Flexible DNS proxy supporting DNSCrypt and DoH
PLUGIN_DEPENDS= dnscrypt-proxy2
PLUGIN_MAINTAINER= m.muenz@gmail.com
dns/dyndns/Makefile
+1
View File
@@ -1,5 +1,6 @@
PLUGIN_NAME= dyndns
PLUGIN_VERSION= 1.23
PLUGIN_REVISION= 2
PLUGIN_COMMENT= Dynamic DNS Support
PLUGIN_MAINTAINER= franco@opnsense.org
dns/dyndns/src/etc/inc/plugins.inc.d/dyndns/phpDynDNS.inc
+4 -4
View File
@@ -883,11 +883,11 @@ class updatedns
case 'gratisdns':
$server = "https://admin.gratisdns.com/ddns.php";
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
if(substr_count($this->_dnsHost, ".") < 2) {
$domain = $this->_dnsHost;
$hostname = $this->_dnsHost;
if (substr_count($this->_dnsHost, ".") < 2) {
$domain = $this->_dnsHost;
$hostname = $this->_dnsHost;
} else {
list($hostname, $domain) = explode(".", $this->_dnsHost, 2);
list($hostname, $domain) = explode(".", $this->_dnsHost, 2);
}
curl_setopt($ch, CURLOPT_URL, $server . '?u=' . urlencode($this->_dnsUser) . '&p=' . $this->_dnsPass . '&h=' . $this->_dnsHost . '&d=' . $domain . '&i=' . $this->_dnsIP);
break;
dns/rfc2136/Makefile
+1
View File
@@ -1,5 +1,6 @@
PLUGIN_NAME= rfc2136
PLUGIN_VERSION= 1.6
PLUGIN_REVISION= 1
PLUGIN_COMMENT= RFC-2136 Support
PLUGIN_MAINTAINER= franco@opnsense.org
PLUGIN_DEPENDS= bind-tools
misc/theme-cicada/Makefile
+1 -1
View File
@@ -1,5 +1,5 @@
PLUGIN_NAME= theme-cicada
PLUGIN_VERSION= 1.26
PLUGIN_VERSION= 1.27
PLUGIN_COMMENT= The cicada theme - dark grey
PLUGIN_MAINTAINER= rene@team-rebellion.net
misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/main.scss
+71 -195
View File
File diff suppressed because it is too large Load Diff
misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css
+9 -9
View File
@@ -2472,9 +2472,7 @@ input[type="color"]
{
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity=80);
background-color: none !important;
border-color: #191919; }
select[disabled]:hover, select[readonly]:hover, fieldset[disabled]:hover,
@@ -2526,9 +2524,7 @@ input[type="color"]
{
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity=80);
background-color: none;
border:1px solid #191919;
-webkit-box-shadow: none;
box-shadow: none; }
@@ -6331,11 +6327,11 @@ label > input[type="radio"] {
#ipsec .ipsec-tab {
background-color: #3a3a3a !important;
color: #928873 !important;
color: #FFF !important;
}
#ipsec .ipsec-tab.activetab {
background-color: #262626 !important;
background-color: #2d2d2d !important;
color: #dd630d !important;
}
.fw_pass {
@@ -6605,7 +6601,7 @@ ul.jqtree-tree .jqtree-title {
}
.interface-table {
background-color: #242424 !important;
background-color: #191919 !important;
}
.modal-side-settings {
@@ -6620,3 +6616,7 @@ ul.jqtree-tree .jqtree-title {
background-color: #d77610 !important;
color: #FFF !important;
}
.table.border {
border: 1px solid #191919 !important;
}

Some files were not shown because too many files have changed in this diff Show More