upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-05-28 04:34:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
commit 1654bd1f2c
119 changed files with 941 additions and 495 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
LICENSE
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

2
Makefile
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}:

15
Mk/defaults.mk
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

34
Mk/plugins.mk
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

17
Scripts/revbump.sh Executable file
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

34
Scripts/version.sh Executable file
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}

11
Templates/version Normal file
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%%"
}

1
benchmarks/iperf/Makefile
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

1
databases/redis/Makefile
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

1
devel/debug/Makefile
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 \

1
devel/grid_example/Makefile
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

1
devel/helloworld/Makefile
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

1
dns/bind/Makefile
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

2
dns/dnscrypt-proxy/Makefile
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

1
dns/dyndns/Makefile
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

8
dns/dyndns/src/etc/inc/plugins.inc.d/dyndns/phpDynDNS.inc
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;

1
dns/rfc2136/Makefile
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

2
misc/theme-cicada/Makefile
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

266
misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/main.scss
View file

@ -3495,297 +3495,231 @@ input {
select {
&[disabled], &[readonly] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
}
fieldset[disabled] select {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
textarea {
&[disabled], &[readonly] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
}
fieldset[disabled] textarea {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
input[type="text"] {
&[disabled], &[readonly] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
}
fieldset[disabled] input[type="text"] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
input[type="password"] {
&[disabled], &[readonly] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
}
fieldset[disabled] input[type="password"] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
input[type="datetime"] {
&[disabled], &[readonly] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
}
fieldset[disabled] input[type="datetime"] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
input[type="datetime-local"] {
&[disabled], &[readonly] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
}
fieldset[disabled] input[type="datetime-local"] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
input[type="date"] {
&[disabled], &[readonly] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
}
fieldset[disabled] input[type="date"] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
input[type="month"] {
&[disabled], &[readonly] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
}
fieldset[disabled] input[type="month"] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
input[type="time"] {
&[disabled], &[readonly] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
}
fieldset[disabled] input[type="time"] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
input[type="week"] {
&[disabled], &[readonly] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
}
fieldset[disabled] input[type="week"] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
input[type="number"] {
&[disabled], &[readonly] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
}
fieldset[disabled] input[type="number"] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
input[type="email"] {
&[disabled], &[readonly] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
}
fieldset[disabled] input[type="email"] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
input[type="url"] {
&[disabled], &[readonly] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
}
fieldset[disabled] input[type="url"] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
input[type="search"] {
&[disabled], &[readonly] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
}
fieldset[disabled] input[type="search"] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
input[type="tel"] {
&[disabled], &[readonly] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
}
fieldset[disabled] input[type="tel"] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
input[type="color"] {
&[disabled], &[readonly] {
cursor: not-allowed;
background-color: #686868;
opacity: 0.8;
filter: alpha(opacity = 80);
background-color: none !important;
border-color: #191919;
}
}
fieldset[disabled] 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, &[readonly]:hover {
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;
@ -3794,9 +3728,7 @@ select {
fieldset[disabled]:hover {
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;
@ -3805,9 +3737,7 @@ fieldset[disabled]:hover {
textarea {
&[disabled]:hover, &[readonly]:hover {
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;
@ -3816,9 +3746,7 @@ textarea {
fieldset[disabled]:hover textarea:hover {
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;
@ -3827,9 +3755,7 @@ fieldset[disabled]:hover textarea:hover {
input[type="text"] {
&[disabled]:hover, &[readonly]:hover {
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;
@ -3838,9 +3764,7 @@ input[type="text"] {
fieldset[disabled]:hover input[type="text"]:hover {
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;
@ -3849,9 +3773,7 @@ fieldset[disabled]:hover input[type="text"]:hover {
input[type="password"] {
&[disabled]:hover, &[readonly]:hover {
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;
@ -3860,9 +3782,7 @@ input[type="password"] {
fieldset[disabled]:hover input[type="password"]:hover {
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;
@ -3871,9 +3791,7 @@ fieldset[disabled]:hover input[type="password"]:hover {
input[type="datetime"] {
&[disabled]:hover, &[readonly]:hover {
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;
@ -3882,9 +3800,7 @@ input[type="datetime"] {
fieldset[disabled]:hover input[type="datetime"]:hover {
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;
@ -3893,9 +3809,7 @@ fieldset[disabled]:hover input[type="datetime"]:hover {
input[type="datetime-local"] {
&[disabled]:hover, &[readonly]:hover {
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;
@ -3904,9 +3818,7 @@ input[type="datetime-local"] {
fieldset[disabled]:hover input[type="datetime-local"]:hover {
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;
@ -3915,9 +3827,7 @@ fieldset[disabled]:hover input[type="datetime-local"]:hover {
input[type="date"] {
&[disabled]:hover, &[readonly]:hover {
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;
@ -3926,9 +3836,7 @@ input[type="date"] {
fieldset[disabled]:hover input[type="date"]:hover {
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;
@ -3937,9 +3845,7 @@ fieldset[disabled]:hover input[type="date"]:hover {
input[type="month"] {
&[disabled]:hover, &[readonly]:hover {
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;
@ -3948,9 +3854,7 @@ input[type="month"] {
fieldset[disabled]:hover input[type="month"]:hover {
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;
@ -3959,9 +3863,7 @@ fieldset[disabled]:hover input[type="month"]:hover {
input[type="time"] {
&[disabled]:hover, &[readonly]:hover {
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;
@ -3970,9 +3872,7 @@ input[type="time"] {
fieldset[disabled]:hover input[type="time"]:hover {
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;
@ -3981,9 +3881,7 @@ fieldset[disabled]:hover input[type="time"]:hover {
input[type="week"] {
&[disabled]:hover, &[readonly]:hover {
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;
@ -3992,9 +3890,7 @@ input[type="week"] {
fieldset[disabled]:hover input[type="week"]:hover {
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;
@ -4003,9 +3899,7 @@ fieldset[disabled]:hover input[type="week"]:hover {
input[type="number"] {
&[disabled]:hover, &[readonly]:hover {
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;
@ -4014,9 +3908,7 @@ input[type="number"] {
fieldset[disabled]:hover input[type="number"]:hover {
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;
@ -4025,9 +3917,7 @@ fieldset[disabled]:hover input[type="number"]:hover {
input[type="email"] {
&[disabled]:hover, &[readonly]:hover {
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;
@ -4036,9 +3926,7 @@ input[type="email"] {
fieldset[disabled]:hover input[type="email"]:hover {
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;
@ -4047,9 +3935,7 @@ fieldset[disabled]:hover input[type="email"]:hover {
input[type="url"] {
&[disabled]:hover, &[readonly]:hover {
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;
@ -4058,9 +3944,7 @@ input[type="url"] {
fieldset[disabled]:hover input[type="url"]:hover {
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;
@ -4069,9 +3953,7 @@ fieldset[disabled]:hover input[type="url"]:hover {
input[type="search"] {
&[disabled]:hover, &[readonly]:hover {
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;
@ -4080,9 +3962,7 @@ input[type="search"] {
fieldset[disabled]:hover input[type="search"]:hover {
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;
@ -4091,9 +3971,7 @@ fieldset[disabled]:hover input[type="search"]:hover {
input[type="tel"] {
&[disabled]:hover, &[readonly]:hover {
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;
@ -4102,9 +3980,7 @@ input[type="tel"] {
fieldset[disabled]:hover input[type="tel"]:hover {
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;
@ -4113,9 +3989,7 @@ fieldset[disabled]:hover input[type="tel"]:hover {
input[type="color"] {
&[disabled]:hover, &[readonly]:hover {
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;
@ -4124,9 +3998,7 @@ input[type="color"] {
fieldset[disabled]:hover input[type="color"]:hover {
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;
@ -10411,10 +10283,10 @@ label > input {
.ipsec-tab {
background-color: #3a3a3a !important;
color: #928873 !important;
color: #FFF !important;
&.activetab {
background-color: #262626 !important;
background-color: #2d2d2d !important;
color: #dd630d !important;
}
}
@ -10752,7 +10624,7 @@ ul.jqtree-tree {
}
.interface-table {
background-color: #242424 !important;
background-color: #191919 !important;
}
.modal-side-settings {
@ -10767,3 +10639,7 @@ ul.jqtree-tree {
background-color: #d77610 !important;
color: #FFF !important;
}
.table.border {
border: 1px solid #191919 !important;
}

18
misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css
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;
}

2
misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/pick-a-color-1.2.3.min.css vendored
View file

@ -22,7 +22,7 @@
.pick-a-color-markup .color-menu .color-preview.violet{background-color:#ee81ee}
.pick-a-color-markup .color-menu .color-preview.purple{background-color:#80007f}
.pick-a-color-markup .color-menu .color-preview.black{background-color:#000}
.pick-a-color-markup .color-menu .basicColors-content li>a,.pick-a-color-markup .color-menu .savedColors-content li>a{padding:5px 15px 3px 15px;cursor:default;min-height:25px;color:#fff}.pick-a-color-markup .color-menu .basicColors-content li>a:hover,.pick-a-color-markup .color-menu .savedColors-content li>a:hover{background-color:transparent}
.pick-a-color-markup .color-menu .basicColors-content li>a,.pick-a-color-markup .color-menu .savedColors-content li>a{padding:5px 15px 3px 15px;cursor:default;min-height:25px;color:#fff}.pick-a-color-markup .color-menu .basicColors-content li>a:hover,.pick-a-color-markup .color-menu .savedColors-content li>a:hover{background-color:none}
@media screen and (max-width:991px){.pick-a-color-markup .color-menu .basicColors-content li>a,.pick-a-color-markup .color-menu .savedColors-content li>a{min-height:40px}}
.pick-a-color-markup .color-menu .basicColors-content li:hover a,.pick-a-color-markup .color-menu .savedColors-content li:hover a{color:#dd630d;background-image:none;filter:none;text-decoration:none;font-weight:bold}@media screen and (max-width:991px){.pick-a-color-markup .color-menu .basicColors-content li:hover a,.pick-a-color-markup .color-menu .savedColors-content li:hover a{background-color:#fff;font-weight:normal}}
.pick-a-color-markup .color-menu .btn.color-select{margin:0px 5px;height:20px;padding:0px 5px;margin-top:0px;line-height:1.5px;border-radius:4px}@media screen and (max-width:991px){.pick-a-color-markup .color-menu .btn.color-select{height:35px}}

1
misc/theme-rebellion/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= theme-rebellion
PLUGIN_VERSION= 1.8.6
PLUGIN_REVISION= 1
PLUGIN_COMMENT= A suitably dark theme
PLUGIN_MAINTAINER= team-rebellion@queens-park.com

2
misc/theme-tukan/Makefile
View file

@ -1,5 +1,5 @@
PLUGIN_NAME= theme-tukan
PLUGIN_VERSION= 1.23
PLUGIN_VERSION= 1.24
PLUGIN_COMMENT= The tukan theme - blue/white
PLUGIN_MAINTAINER= rene@team-rebellion.net

4
misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/main.scss
View file

@ -10679,3 +10679,7 @@ input[type="checkbox"] {
label.btn.au-target {
color: #FFF !important;
}
.table.border {
border: 1px solid #bdbdbd;
}

4
misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/main.css
View file

@ -6513,3 +6513,7 @@ input[type="checkbox"].checkbox-switch:checked + i::before, input[type="checkbox
label.btn.au-target {
color: #FFF !important;
}
.table.border {
border: 1px solid #bdbdbd;
}

86
misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/pick-a-color-1.2.3.min.css vendored Normal file
View file

@ -0,0 +1,86 @@
.pick-a-color-markup *{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}
.pick-a-color-markup .hex-pound{padding-left:8px;padding-right:8px}@media screen and (max-width:991px){.pick-a-color-markup .hex-pound{padding:3px 5px 0px 5px;min-height:30px}}
.pick-a-color-markup .pick-a-color{padding:5px}@media screen and (max-width:991px){.pick-a-color-markup .pick-a-color{width:100%;font-size:18px;padding:9px;min-width:222px;height:47px}}
.pick-a-color-markup .input-group-btn .color-dropdown{padding:6px 5px}.pick-a-color-markup .input-group-btn .color-dropdown.no-hex{border-bottom-left-radius:4px;border-top-left-radius:4px}
.pick-a-color-markup .input-group-btn .color-dropdown:focus{background-color:#fff}
@media screen and (max-width:991px){.pick-a-color-markup .input-group-btn .color-dropdown{height:47px}}
.pick-a-color-markup .color-preview{border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 0 2px 2px rgba(0,0,0,0.075);box-shadow:inset 0 0 2px 2px rgba(0,0,0,0.075);height:1.429em;width:1.429em;display:inline-block;cursor:pointer;margin-right:5px}.pick-a-color-markup .color-preview.current-color{margin-bottom:-5px}
@media screen and (max-width:991px){.pick-a-color-markup .color-preview{height:1.875em;width:1.875em}}
.pick-a-color-markup .color-menu{text-align:left;padding:5px 0px;width:330px;font-size:14px;left:auto;}.pick-a-color-markup .color-menu.color-menu--inline{left:-285px}@media screen and (max-width:991px){.pick-a-color-markup .color-menu.color-menu--inline{left:-242px}}
@media screen and (max-width:991px){.pick-a-color-markup .color-menu{left:-242px;width:293px}}.pick-a-color-markup .color-menu.small{width:100px}@media screen and (max-width:991px){.pick-a-color-markup .color-menu.small{left:-105px}}
.pick-a-color-markup .color-menu.no-hex{left:0px}
.pick-a-color-markup .color-menu ul{padding:0px;margin:0px}
.pick-a-color-markup .color-menu li{list-style-type:none;padding:5px 0px;margin:0px}
.pick-a-color-markup .color-menu .color-preview{vertical-align:middle;margin:0px}@media screen and (max-width:991px){.pick-a-color-markup .color-menu .color-preview{height:35px;width:35px}}.pick-a-color-markup .color-menu .color-preview.current-color,.pick-a-color-markup .color-menu .color-preview.white{background-color:#fff}
.pick-a-color-markup .color-menu .color-preview.red{background-color:#f00}
.pick-a-color-markup .color-menu .color-preview.orange{background-color:#f60}
.pick-a-color-markup .color-menu .color-preview.yellow{background-color:#ff0}
.pick-a-color-markup .color-menu .color-preview.green{background-color:#008000}
.pick-a-color-markup .color-menu .color-preview.blue{background-color:#00f}
.pick-a-color-markup .color-menu .color-preview.indigo{background-color:#4a0080}
.pick-a-color-markup .color-menu .color-preview.violet{background-color:#ee81ee}
.pick-a-color-markup .color-menu .color-preview.purple{background-color:#80007f}
.pick-a-color-markup .color-menu .color-preview.black{background-color:#000}
.pick-a-color-markup .color-menu .basicColors-content li>a,.pick-a-color-markup .color-menu .savedColors-content li>a{padding:5px 15px 3px 15px;cursor:default;min-height:25px;color:#FFF}.pick-a-color-markup .color-menu .basicColors-content li>a:hover,.pick-a-color-markup .color-menu .savedColors-content li>a:hover{background-color:none}
@media screen and (max-width:991px){.pick-a-color-markup .color-menu .basicColors-content li>a,.pick-a-color-markup .color-menu .savedColors-content li>a{min-height:40px}}
.pick-a-color-markup .color-menu .basicColors-content li:hover a,.pick-a-color-markup .color-menu .savedColors-content li:hover a{color:#FFF;background-image:none;filter:none;text-decoration:none;font-weight:bold}@media screen and (max-width:991px){.pick-a-color-markup .color-menu .basicColors-content li:hover a,.pick-a-color-markup .color-menu .savedColors-content li:hover a{background-color:#fff;font-weight:normal}}
.pick-a-color-markup .color-menu .btn.color-select{margin:0px 5px;height:20px;padding:0px 5px;margin-top:0px;line-height:1.5px;border-radius:4px}@media screen and (max-width:991px){.pick-a-color-markup .color-menu .btn.color-select{height:35px}}
.pick-a-color-markup .caret{margin-bottom:3px;color: #000;}
.pick-a-color-markup .color-menu-instructions,.pick-a-color-markup .advanced-instructions{text-align:center;padding:0px 6px;margin:0px;font-size:14px;font-weight:normal}@media screen and (min-width:992px){.pick-a-color-markup .color-menu-instructions,.pick-a-color-markup .advanced-instructions{display:none}}
.pick-a-color-markup .color-label{vertical-align:middle;margin:0px;margin-left:10px;cursor:pointer}@media screen and (max-width:991px){.pick-a-color-markup .color-label{margin-left:8px}}
.pick-a-color-markup .color-box{height:20px;width:200px;position:absolute;left:115px;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 0 2px 2px rgba(0,0,0,0.075);box-shadow:inset 0 0 2px 2px rgba(0,0,0,0.075);cursor:pointer}@media screen and (max-width:991px){.pick-a-color-markup .color-box{width:160px;height:35px}}
.pick-a-color-markup .black .highlight-band-stripe{background-color:#fff}
.pick-a-color-markup .spectrum-white{background-image:-webkit-gradient(linear, 0 top, 100% top, from(#fff), to(#808080));background-image:-webkit-linear-gradient(left, color-stop(#fff 0), color-stop(#808080 100%));background-image:-moz-linear-gradient(left, #fff 0, #808080 100%);background-image:linear-gradient(to right, #fff 0, #808080 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ff808080', GradientType=1)}.pick-a-color-markup .spectrum-white .highlight-band{left:0px}
.pick-a-color-markup .spectrum-red{background-image:-webkit-gradient(linear, left top, right top, color-stop(0, #fff), color-stop(.5, #f00), color-stop(1, #000));background-image:-moz-linear-gradient(left center, #fff 0, #f00 50%, #000 100%);background-image:-webkit-linear-gradient(left, #fff 0, #f00 50%, #000 100%);background-image:-o-linear-gradient(left, #fff 0, #f00 50%, #000 100%);background-image:linear-gradient(to right, #fff 0, #f00 50%, #000 100%);background-repeat:repeat-x}
.pick-a-color-markup .spectrum-orange{background-image:-webkit-gradient(linear, left top, right top, color-stop(0, #fff), color-stop(.5, #f60), color-stop(1, #000));background-image:-moz-linear-gradient(left center, #fff 0, #f60 50%, #000 100%);background-image:-webkit-linear-gradient(left, #fff 0, #f60 50%, #000 100%);background-image:-o-linear-gradient(left, #fff 0, #f60 50%, #000 100%);background-image:linear-gradient(to right, #fff 0, #f60 50%, #000 100%);background-repeat:repeat-x}
.pick-a-color-markup .spectrum-yellow{background-image:-webkit-gradient(linear, left top, right top, color-stop(0, #fff), color-stop(.5, #ff0), color-stop(1, #000));background-image:-moz-linear-gradient(left center, #fff 0, #ff0 50%, #000 100%);background-image:-webkit-linear-gradient(left, #fff 0, #ff0 50%, #000 100%);background-image:-o-linear-gradient(left, #fff 0, #ff0 50%, #000 100%);background-image:linear-gradient(to right, #fff 0, #ff0 50%, #000 100%);background-repeat:repeat-x}
.pick-a-color-markup .spectrum-green{background-image:-webkit-gradient(linear, left top, right top, color-stop(0, #80ff80), color-stop(.5, #008000), color-stop(1, #000));background-image:-moz-linear-gradient(left center, #80ff80 0, #008000 50%, #000 100%);background-image:-webkit-linear-gradient(left, #80ff80 0, #008000 50%, #000 100%);background-image:-o-linear-gradient(left, #80ff80 0, #008000 50%, #000 100%);background-image:linear-gradient(to right, #80ff80 0, #008000 50%, #000 100%);background-repeat:repeat-x}
.pick-a-color-markup .spectrum-blue{background-image:-webkit-gradient(linear, left top, right top, color-stop(0, #fff), color-stop(.5, #00f), color-stop(1, #000));background-image:-moz-linear-gradient(left center, #fff 0, #00f 50%, #000 100%);background-image:-webkit-linear-gradient(left, #fff 0, #00f 50%, #000 100%);background-image:-o-linear-gradient(left, #fff 0, #00f 50%, #000 100%);background-image:linear-gradient(to right, #fff 0, #00f 50%, #000 100%);background-repeat:repeat-x}
.pick-a-color-markup .spectrum-purple{background-image:-webkit-gradient(linear, left top, right top, color-stop(0, #ff80ff), color-stop(.5, #80007f), color-stop(1, #000));background-image:-moz-linear-gradient(left center, #ff80ff 0, #80007f 50%, #000 100%);background-image:-webkit-linear-gradient(left, #ff80ff 0, #80007f 50%, #000 100%);background-image:-o-linear-gradient(left, #ff80ff 0, #80007f 50%, #000 100%);background-image:linear-gradient(to right, #ff80ff 0, #80007f 50%, #000 100%);background-repeat:repeat-x}
.pick-a-color-markup .spectrum-black{background-image:-webkit-gradient(linear, 0 top, 100% top, from(#000), to(#808080));background-image:-webkit-linear-gradient(left, color-stop(#000 0), color-stop(#808080 100%));background-image:-moz-linear-gradient(left, #000 0, #808080 100%);background-image:linear-gradient(to right, #000 0, #808080 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff000000', endColorstr='#ff808080', GradientType=1)}.pick-a-color-markup .spectrum-black .highlight-band{left:0px;border:1px solid #808080}
.pick-a-color-markup .ie-spectrum{height:20px;width:100px;display:inline-block;top:-1}.pick-a-color-markup .ie-spectrum.hue{width:50.5px}@media screen and (max-width:991px){.pick-a-color-markup .ie-spectrum.hue{width:45.5px}}
@media screen and (max-width:991px){.pick-a-color-markup .ie-spectrum{width:80px;height:35px}}
.pick-a-color-markup .red-spectrum-0,.pick-a-color-markup .lightness-spectrum-0{background-image:-webkit-gradient(linear, 0 top, 100% top, from(#fff), to(#f00));background-image:-webkit-linear-gradient(left, color-stop(#fff 0), color-stop(#f00 100%));background-image:-moz-linear-gradient(left, #fff 0, #f00 100%);background-image:linear-gradient(to right, #fff 0, #f00 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffff0000', GradientType=1);border-bottom-left-radius:4px;border-top-left-radius:4px}
.pick-a-color-markup .red-spectrum-1,.pick-a-color-markup .lightness-spectrum-1{background-image:-webkit-gradient(linear, 0 top, 100% top, from(#f00), to(#000));background-image:-webkit-linear-gradient(left, color-stop(#f00 0), color-stop(#000 100%));background-image:-moz-linear-gradient(left, #f00 0, #000 100%);background-image:linear-gradient(to right, #f00 0, #000 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffff0000', endColorstr='#ff000000', GradientType=1);border-bottom-right-radius:4px;border-top-right-radius:4px}
.pick-a-color-markup .lightness-spectrum-0,.pick-a-color-markup .lightness-spectrum-1{width:150px}@media screen and (max-width:991px){.pick-a-color-markup .lightness-spectrum-0,.pick-a-color-markup .lightness-spectrum-1{width:135px}}
.pick-a-color-markup .orange-spectrum-0{background-image:-webkit-gradient(linear, 0 top, 100% top, from(#fff), to(#f60));background-image:-webkit-linear-gradient(left, color-stop(#fff 0), color-stop(#f60 100%));background-image:-moz-linear-gradient(left, #fff 0, #f60 100%);background-image:linear-gradient(to right, #fff 0, #f60 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffff6600', GradientType=1);border-bottom-left-radius:4px;border-top-left-radius:4px}
.pick-a-color-markup .orange-spectrum-1{background-image:-webkit-gradient(linear, 0 top, 100% top, from(#f60), to(#000));background-image:-webkit-linear-gradient(left, color-stop(#f60 0), color-stop(#000 100%));background-image:-moz-linear-gradient(left, #f60 0, #000 100%);background-image:linear-gradient(to right, #f60 0, #000 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffff6600', endColorstr='#ff000000', GradientType=1);border-bottom-right-radius:4px;border-top-right-radius:4px}
.pick-a-color-markup .yellow-spectrum-0{background-image:-webkit-gradient(linear, 0 top, 100% top, from(#fff), to(#ff0));background-image:-webkit-linear-gradient(left, color-stop(#fff 0), color-stop(#ff0 100%));background-image:-moz-linear-gradient(left, #fff 0, #ff0 100%);background-image:linear-gradient(to right, #fff 0, #ff0 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffffff00', GradientType=1);border-bottom-left-radius:4px;border-top-left-radius:4px}
.pick-a-color-markup .yellow-spectrum-1{background-image:-webkit-gradient(linear, 0 top, 100% top, from(#ff0), to(#000));background-image:-webkit-linear-gradient(left, color-stop(#ff0 0), color-stop(#000 100%));background-image:-moz-linear-gradient(left, #ff0 0, #000 100%);background-image:linear-gradient(to right, #ff0 0, #000 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff00', endColorstr='#ff000000', GradientType=1);border-bottom-right-radius:4px;border-top-right-radius:4px}
.pick-a-color-markup .green-spectrum-0{background-image:-webkit-gradient(linear, 0 top, 100% top, from(#80ff80), to(#008000));background-image:-webkit-linear-gradient(left, color-stop(#80ff80 0), color-stop(#008000 100%));background-image:-moz-linear-gradient(left, #80ff80 0, #008000 100%);background-image:linear-gradient(to right, #80ff80 0, #008000 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff80ff80', endColorstr='#ff008000', GradientType=1);border-bottom-left-radius:4px;border-top-left-radius:4px}
.pick-a-color-markup .green-spectrum-1{background-image:-webkit-gradient(linear, 0 top, 100% top, from(#008000), to(#000));background-image:-webkit-linear-gradient(left, color-stop(#008000 0), color-stop(#000 100%));background-image:-moz-linear-gradient(left, #008000 0, #000 100%);background-image:linear-gradient(to right, #008000 0, #000 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff008000', endColorstr='#ff000000', GradientType=1);border-bottom-right-radius:4px;border-top-right-radius:4px}
.pick-a-color-markup .blue-spectrum-0{background-image:-webkit-gradient(linear, 0 top, 100% top, from(#fff), to(#00f));background-image:-webkit-linear-gradient(left, color-stop(#fff 0), color-stop(#00f 100%));background-image:-moz-linear-gradient(left, #fff 0, #00f 100%);background-image:linear-gradient(to right, #fff 0, #00f 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ff0000ff', GradientType=1);border-bottom-left-radius:4px;border-top-left-radius:4px}
.pick-a-color-markup .blue-spectrum-1{background-image:-webkit-gradient(linear, 0 top, 100% top, from(#00f), to(#000));background-image:-webkit-linear-gradient(left, color-stop(#00f 0), color-stop(#000 100%));background-image:-moz-linear-gradient(left, #00f 0, #000 100%);background-image:linear-gradient(to right, #00f 0, #000 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0000ff', endColorstr='#ff000000', GradientType=1);border-bottom-right-radius:4px;border-top-right-radius:4px}
.pick-a-color-markup .purple-spectrum-0{background-image:-webkit-gradient(linear, 0 top, 100% top, from(#ff80ff), to(#80007f));background-image:-webkit-linear-gradient(left, color-stop(#ff80ff 0), color-stop(#80007f 100%));background-image:-moz-linear-gradient(left, #ff80ff 0, #80007f 100%);background-image:linear-gradient(to right, #ff80ff 0, #80007f 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffff80ff', endColorstr='#ff80007f', GradientType=1);border-bottom-left-radius:4px;border-top-left-radius:4px}
.pick-a-color-markup .purple-spectrum-1{background-image:-webkit-gradient(linear, 0 top, 100% top, from(#80007f), to(#000));background-image:-webkit-linear-gradient(left, color-stop(#80007f 0), color-stop(#000 100%));background-image:-moz-linear-gradient(left, #80007f 0, #000 100%);background-image:linear-gradient(to right, #80007f 0, #000 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff80007f', endColorstr='#ff000000', GradientType=1);border-bottom-right-radius:4px;border-top-right-radius:4px}
.pick-a-color-markup .saturation-spectrum-0{background-image:-webkit-gradient(linear, 0 top, 100% top, from(#808080), to(#bf4040));background-image:-webkit-linear-gradient(left, color-stop(#808080 0), color-stop(#bf4040 100%));background-image:-moz-linear-gradient(left, #808080 0, #bf4040 100%);background-image:linear-gradient(to right, #808080 0, #bf4040 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff808080', endColorstr='#ffbf4040', GradientType=1);border-bottom-left-radius:4px;border-top-left-radius:4px;width:150px}@media screen and (max-width:991px){.pick-a-color-markup .saturation-spectrum-0{width:135px}}
.pick-a-color-markup .saturation-spectrum-1{background-image:-webkit-gradient(linear, 0 top, 100% top, from(#bf4040), to(#f00));background-image:-webkit-linear-gradient(left, color-stop(#bf4040 0), color-stop(#f00 100%));background-image:-moz-linear-gradient(left, #bf4040 0, #f00 100%);background-image:linear-gradient(to right, #bf4040 0, #f00 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffbf4040', endColorstr='#ffff0000', GradientType=1);border-bottom-right-radius:4px;border-top-right-radius:4px;width:150px}@media screen and (max-width:991px){.pick-a-color-markup .saturation-spectrum-1{width:135px}}
.pick-a-color-markup .hue-spectrum-0{background-image:-webkit-gradient(linear, 0 top, 100% top, from(#f00), to(#ff0));background-image:-webkit-linear-gradient(left, color-stop(#f00 0), color-stop(#ff0 100%));background-image:-moz-linear-gradient(left, #f00 0, #ff0 100%);background-image:linear-gradient(to right, #f00 0, #ff0 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffff0000', endColorstr='#ffffff00', GradientType=1)}
.pick-a-color-markup .hue-spectrum-1{background-image:-webkit-gradient(linear, 0 top, 100% top, from(#ff0), to(#0f0));background-image:-webkit-linear-gradient(left, color-stop(#ff0 0), color-stop(#0f0 100%));background-image:-moz-linear-gradient(left, #ff0 0, #0f0 100%);background-image:linear-gradient(to right, #ff0 0, #0f0 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff00', endColorstr='#ff00ff00', GradientType=1)}
.pick-a-color-markup .hue-spectrum-2{background-image:-webkit-gradient(linear, 0 top, 100% top, from(#0f0), to(#0ff));background-image:-webkit-linear-gradient(left, color-stop(#0f0 0), color-stop(#0ff 100%));background-image:-moz-linear-gradient(left, #0f0 0, #0ff 100%);background-image:linear-gradient(to right, #0f0 0, #0ff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff00ff00', endColorstr='#ff00ffff', GradientType=1);left:-1px;position:relative}
.pick-a-color-markup .hue-spectrum-3{background-image:-webkit-gradient(linear, 0 top, 100% top, from(#0ff), to(#00f));background-image:-webkit-linear-gradient(left, color-stop(#0ff 0), color-stop(#00f 100%));background-image:-moz-linear-gradient(left, #0ff 0, #00f 100%);background-image:linear-gradient(to right, #0ff 0, #00f 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff00ffff', endColorstr='#ff0000ff', GradientType=1);left:-1px;position:relative}
.pick-a-color-markup .hue-spectrum-4{background-image:-webkit-gradient(linear, 0 top, 100% top, from(#00f), to(#f0f));background-image:-webkit-linear-gradient(left, color-stop(#00f 0), color-stop(#f0f 100%));background-image:-moz-linear-gradient(left, #00f 0, #f0f 100%);background-image:linear-gradient(to right, #00f 0, #f0f 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0000ff', endColorstr='#ffff00ff', GradientType=1);left:-1px;position:relative}
.pick-a-color-markup .hue-spectrum-5{background-image:-webkit-gradient(linear, 0 top, 100% top, from(#f0f), to(#f00));background-image:-webkit-linear-gradient(left, color-stop(#f0f 0), color-stop(#f00 100%));background-image:-moz-linear-gradient(left, #f0f 0, #f00 100%);background-image:linear-gradient(to right, #f0f 0, #f00 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffff00ff', endColorstr='#ffff0000', GradientType=1);left:-2px;position:relative}
.pick-a-color-markup .highlight-band{border:1px solid #222;border-radius:2px;-webkit-box-shadow:1px 1px 1px #333;box-shadow:1px 1px 1px #333;height:19px;width:11px;display:inline-block;cursor:pointer;cursor:-webkit-grab;cursor:-moz-grab;position:absolute;top:-1px;left:94.5px;text-align:center}@media screen and (max-width:991px){.pick-a-color-markup .highlight-band{width:21px;left:69.5px;height:34px}}
.pick-a-color-markup .highlight-band-stripe{min-height:80%;min-width:1px;background-color:#000;opacity:0.40;margin:2px 1px;display:inline-block;-webkit-box-shadow:1px 0 2px 0 #fff;box-shadow:1px 0 2px 0 #fff}@media screen and (max-width:991px){.pick-a-color-markup .highlight-band-stripe{margin:4px 2px}}
.pick-a-color-markup .color-menu-tabs{padding:5px 3px 3px 10px;font-size:12px;color:#333;border-bottom:1px solid #ccc;margin-bottom:5px}.pick-a-color-markup .color-menu-tabs .tab{padding:4px 5px;margin:5px;border-left:1px solid #fff;border-right:1px solid #fff;cursor:pointer;background-color:#fff}.pick-a-color-markup .color-menu-tabs .tab:hover{padding-bottom:6px;border-top:1px solid #ccc;border-right:1px solid #ccc;border-left:1px solid #ccc;border-top-right-radius:4px;border-top-left-radius:4px}
.pick-a-color-markup .color-menu-tabs a{color:#333;text-decoration:none}
.pick-a-color-markup .color-menu-tabs .tab-active{border-bottom:3px solid #fff;padding-bottom:5px;border-top:1px solid #ccc;border-right:1px solid #ccc;border-left:1px solid #ccc;border-top-right-radius:4px;border-top-left-radius:4px}
.pick-a-color-markup .active-content{display:block}
.pick-a-color-markup .inactive-content{display:none}
.pick-a-color-markup .savedColors-content{padding:5px 15px;white-space:normal}.pick-a-color-markup .savedColors-content li.color-item>a{margin-left:7px;padding-left:8px;border-radius:4px}
.pick-a-color-markup .saved-color-col{position:relative;left:-15px;float:left;width:149px}@media screen and (max-width:991px){.pick-a-color-markup .saved-color-col{width:130px}}
.pick-a-color-markup .advanced-content ul{margin-top:10px}
.pick-a-color-markup .advanced-content li{padding:5px 15px 3px 15px;cursor:default;min-height:25px;height:50px;position:relative}@media screen and (max-width:991px){.pick-a-color-markup .advanced-content li{min-height:70px}}
.pick-a-color-markup .advanced-content .color-preview{height:50px;width:300px;float:left;margin:0px 0px 10px 0px;background-color:#f00;text-align:center}.pick-a-color-markup .advanced-content .color-preview .color-select.btn.advanced{margin-top:15px;display:none}@media screen and (max-width:991px){.pick-a-color-markup .advanced-content .color-preview .color-select.btn.advanced{display:inline;margin-top:7px}}
.pick-a-color-markup .advanced-content .color-preview:hover .color-select.btn.advanced{display:inline}
@media screen and (max-width:991px){.pick-a-color-markup .advanced-content .color-preview{width:270px;margin-left:-10px}}
.pick-a-color-markup .advanced-content .spectrum-hue{background-image:-webkit-gradient(linear, left top, right top, color-stop(0, #f00), color-stop(17%, #ff0), color-stop(34%, #0f0), color-stop(51%, #0ff), color-stop(68%, #00f), color-stop(85%, #f0f), color-stop(100%, #f00));background-image:-moz-linear-gradient(left center, #f00 0, #ff0 17%, #0f0 24%, #0ff 51%, #00f 68%, #f0f 85%, #f00 100%);background-image:-webkit-linear-gradient(left, #f00 0, #ff0 17%, #0f0 24%, #0ff 51%, #00f 68%, #f0f 85%, #f00 100%);background-image:-o-linear-gradient(left, #f00 0, #ff0 17%, #0f0 24%, #0ff 51%, #00f 68%, #f0f 85%, #f00 100%);background-image:linear-gradient(to right, #f00 0, #ff0 17%, #0f0 24%, #0ff 51%, #00f 68%, #f0f 85%, #f00 100%);background-repeat:repeat-x}.pick-a-color-markup .advanced-content .spectrum-hue .highlight-band{left:0px}
.pick-a-color-markup .advanced-content .spectrum-lightness{background-image:-webkit-gradient(linear, left top, right top, color-stop(0, #fff), color-stop(.5, #f00), color-stop(1, #000));background-image:-moz-linear-gradient(left center, #fff 0, #f00 50%, #000 100%);background-image:-webkit-linear-gradient(left, #fff 0, #f00 50%, #000 100%);background-image:-o-linear-gradient(left, #fff 0, #f00 50%, #000 100%);background-image:linear-gradient(to right, #fff 0, #f00 50%, #000 100%);background-repeat:repeat-x}
.pick-a-color-markup .advanced-content .spectrum-saturation{background-image:-webkit-gradient(linear, left top, right top, color-stop(0, #808080), color-stop(.5, #f00), color-stop(1, #f00));background-image:-moz-linear-gradient(left center, #808080 0, #f00 50%, #f00 100%);background-image:-webkit-linear-gradient(left, #808080 0, #f00 50%, #f00 100%);background-image:-o-linear-gradient(left, #808080 0, #f00 50%, #f00 100%);background-image:linear-gradient(to right, #808080 0, #f00 50%, #f00 100%);background-repeat:repeat-x}.pick-a-color-markup .advanced-content .spectrum-saturation .highlight-band{left:287px}@media screen and (max-width:991px){.pick-a-color-markup .advanced-content .spectrum-saturation .highlight-band{left:247px}}
.pick-a-color-markup .advanced-content .spectrum-lightness .highlight-band{left:143.5px}@media screen and (max-width:991px){.pick-a-color-markup .advanced-content .spectrum-lightness .highlight-band{left:123.5px}}
.pick-a-color-markup .advanced-content .lightness-text,.pick-a-color-markup .advanced-content .hue-text,.pick-a-color-markup .advanced-content .saturation-text,.pick-a-color-markup .advanced-content .preview-text{vertical-align:middle;text-align:center;display:block}
.pick-a-color-markup .advanced-content .color-box{left:15px;top:25px;width:300px}@media screen and (max-width:991px){.pick-a-color-markup .advanced-content .color-box{width:270px;left:10px}}
.pick-a-color-markup .advanced-content .preview-item{height:80px}
@-moz-document url-prefix(){@media screen and (max-width:991px){div.pick-a-color-markup .color-menu{left:0px}}}

2
misc/theme-vicuna/Makefile
View file

@ -1,5 +1,5 @@
PLUGIN_NAME= theme-vicuna
PLUGIN_VERSION= 1.2
PLUGIN_VERSION= 1.3
PLUGIN_COMMENT= The vicuna theme - dark anthrazit
PLUGIN_MAINTAINER= rene@team-rebellion.net

12
misc/theme-vicuna/src/opnsense/www/themes/vicuna/assets/stylesheets/main.scss
View file

@ -10434,12 +10434,14 @@ label > input {
}
.ipsec-tab {
background-color: #839caa !important;
background-color: #202f3a !important;
color: #FFF !important;
opacity: 0.5;
&.activetab {
background-color: #315a71 !important;
color: #FFF !important;
background-color: #202f3a !important;
color: #D77610 !important;
opacity: 1;
}
}
}
@ -10760,3 +10762,7 @@ ul.jqtree-tree {
background-color: #d77610 !important;
color: #FFF !important;
}
.table.border {
border: 1px solid #181818 !important;
}

2
misc/theme-vicuna/src/opnsense/www/themes/vicuna/assets/stylesheets/tokenizer2.scss
View file

@ -38,7 +38,7 @@
> {
.token {
padding: 0 1.2em 0 5px;
background-color: #d7af10;
background-color: #d77610;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;

12
misc/theme-vicuna/src/opnsense/www/themes/vicuna/build/css/main.css
View file

@ -6333,13 +6333,15 @@ label > input[type="radio"] {
}
#ipsec .ipsec-tab {
background-color: #839caa !important;
background-color: #202f3a !important;
color: #FFF !important;
opacity: 0.5;
}
#ipsec .ipsec-tab.activetab {
background-color: #315a71 !important;
color: #FFF !important;
background-color: #202f3a !important;
color: #D77610 !important;
opacity: 1;
}
.fw_pass {
background-color: #203a23 !important;
@ -6577,3 +6579,7 @@ ul.jqtree-tree .jqtree-title {
background-color: #d77610 !important;
color: #FFF !important;
}
.table.border {
border: 1px solid #181818 !important;
}

5
misc/theme-vicuna/src/opnsense/www/themes/vicuna/build/css/nv.d3.css
View file

@ -335,11 +335,6 @@ svg.nvd3-svg {
fill-opacity: .7;
}
circle.nv-legend-symbol {
fill: rgb(151, 151, 151) !important;
stroke: rgb(151, 151, 151) !important;
}
/**********
* Print
*/

2
misc/theme-vicuna/src/opnsense/www/themes/vicuna/build/css/pick-a-color-1.2.3.min.css vendored
View file

@ -22,7 +22,7 @@
.pick-a-color-markup .color-menu .color-preview.violet{background-color:#ee81ee}
.pick-a-color-markup .color-menu .color-preview.purple{background-color:#80007f}
.pick-a-color-markup .color-menu .color-preview.black{background-color:#000}
.pick-a-color-markup .color-menu .basicColors-content li>a,.pick-a-color-markup .color-menu .savedColors-content li>a{padding:5px 15px 3px 15px;cursor:default;min-height:25px;color:#fff}.pick-a-color-markup .color-menu .basicColors-content li>a:hover,.pick-a-color-markup .color-menu .savedColors-content li>a:hover{background-color:transparent}
.pick-a-color-markup .color-menu .basicColors-content li>a,.pick-a-color-markup .color-menu .savedColors-content li>a{padding:5px 15px 3px 15px;cursor:default;min-height:25px;color:#fff}.pick-a-color-markup .color-menu .basicColors-content li>a:hover,.pick-a-color-markup .color-menu .savedColors-content li>a:hover{background-color:none}
@media screen and (max-width:991px){.pick-a-color-markup .color-menu .basicColors-content li>a,.pick-a-color-markup .color-menu .savedColors-content li>a{min-height:40px}}
.pick-a-color-markup .color-menu .basicColors-content li:hover a,.pick-a-color-markup .color-menu .savedColors-content li:hover a{color:#dd630d;background-image:none;filter:none;text-decoration:none;font-weight:bold}@media screen and (max-width:991px){.pick-a-color-markup .color-menu .basicColors-content li:hover a,.pick-a-color-markup .color-menu .savedColors-content li:hover a{background-color:#fff;font-weight:normal}}
.pick-a-color-markup .color-menu .btn.color-select{margin:0px 5px;height:20px;padding:0px 5px;margin-top:0px;line-height:1.5px;border-radius:4px}@media screen and (max-width:991px){.pick-a-color-markup .color-menu .btn.color-select{height:35px}}

2
misc/theme-vicuna/src/opnsense/www/themes/vicuna/build/css/tokenize2.css
View file

@ -35,7 +35,7 @@
.tokenize > .tokens-container > .token {
padding: 0 1.2em 0 5px;
background-color: #d7af10;
background-color: #d77610;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;

1
net-mgmt/collectd/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= collectd
PLUGIN_VERSION= 1.3
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Collect system and application performance metrics periodically
PLUGIN_DEPENDS= collectd5
PLUGIN_MAINTAINER= m.muenz@gmail.com

1
net-mgmt/lldpd/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= lldpd
PLUGIN_VERSION= 1.1
PLUGIN_REVISION= 1
PLUGIN_COMMENT= LLDP allows you to know exactly on which port is a server
PLUGIN_DEPENDS= lldpd
PLUGIN_MAINTAINER= m.muenz@gmail.com

1
net-mgmt/net-snmp/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= net-snmp
PLUGIN_VERSION= 1.4
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Net-SNMP is a daemon for the SNMP protocol
PLUGIN_DEPENDS= net-snmp
PLUGIN_MAINTAINER= m.muenz@gmail.com

1
net-mgmt/netdata/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= netdata
PLUGIN_VERSION= 1.0
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Real-time performance monitoring
PLUGIN_DEPENDS= netdata
PLUGIN_MAINTAINER= m.muenz@gmail.com

2
net-mgmt/nrpe/Makefile
View file

@ -1,6 +1,6 @@
PLUGIN_NAME= nrpe
PLUGIN_VERSION= 1.0
PLUGIN_REVISION= 1
PLUGIN_REVISION= 2
PLUGIN_COMMENT= Execute nagios plugins
PLUGIN_DEPENDS= nrpe3
PLUGIN_MAINTAINER= m.muenz@gmail.com

1
net-mgmt/telegraf/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= telegraf
PLUGIN_VERSION= 1.8.3
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Agent for collecting metrics and data
PLUGIN_DEPENDS= telegraf
PLUGIN_MAINTAINER= m.muenz@gmail.com

1
net-mgmt/zabbix-agent/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= zabbix-agent
PLUGIN_VERSION= 1.8
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Zabbix monitoring agent
PLUGIN_DEPENDS= zabbix5-agent
PLUGIN_MAINTAINER= opnsense@moov.de

1
net-mgmt/zabbix4-proxy/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= zabbix4-proxy
PLUGIN_VERSION= 1.2
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Zabbix Proxy enables decentralized monitoring
PLUGIN_DEPENDS= zabbix4-proxy
PLUGIN_CONFLICTS= zabbix5-proxy

1
net-mgmt/zabbix5-proxy/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= zabbix5-proxy
PLUGIN_VERSION= 1.3
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Zabbix Proxy enables decentralized monitoring
PLUGIN_DEPENDS= zabbix5-proxy
PLUGIN_CONFLICTS= zabbix4-proxy

1
net/chrony/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= chrony
PLUGIN_VERSION= 1.1
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Chrony time synchronisation
PLUGIN_DEPENDS= chrony
PLUGIN_MAINTAINER= m.muenz@gmail.com

1
net/firewall/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= firewall
PLUGIN_VERSION= 1.0
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Firewall API supplemental package
PLUGIN_MAINTAINER= ad@opnsense.org

1
net/freeradius/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= freeradius
PLUGIN_VERSION= 1.9.9
PLUGIN_REVISION= 1
PLUGIN_COMMENT= RADIUS Authentication, Authorization and Accounting Server
PLUGIN_DEPENDS= freeradius3
PLUGIN_MAINTAINER= m.muenz@gmail.com

2
net/frr/Makefile
View file

@ -1,6 +1,6 @@
PLUGIN_NAME= frr
PLUGIN_VERSION= 1.21
PLUGIN_REVISION= 1
PLUGIN_REVISION= 2
PLUGIN_COMMENT= The FRRouting Protocol Suite
PLUGIN_DEPENDS= frr7
PLUGIN_MAINTAINER= franz.fabian.94@gmail.com

4
net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/DiagnosticsController.php
View file

@ -44,7 +44,7 @@ class DiagnosticsController extends ApiControllerBase
private function getInformation(string $daemon, string $name, string $format): array
{
$backend = new Backend();
$response = $backend->configdRun("quagga diagnostics ".$daemon."_".$name.($format === "json" ? "_json" : ""));
$response = $backend->configdRun("quagga diagnostics " . $daemon . "_" . $name . ($format === "json" ? "_json" : ""));
return array("response" => ($format === "json" ? json_decode($response) : $response));
}
@ -60,7 +60,7 @@ class DiagnosticsController extends ApiControllerBase
if ($format === "json") {
return array("response" => array("ipv4" => $routes4, "ipv6" => $routes6));
} else {
return array("response" => $routes4.$routes6);
return array("response" => $routes4 . $routes6);
}
}

2
net/ftp-proxy/Makefile
View file

@ -1,6 +1,6 @@
PLUGIN_NAME= ftp-proxy
PLUGIN_VERSION= 1.0
PLUGIN_REVISION= 2
PLUGIN_REVISION= 3
PLUGIN_COMMENT= Control ftp-proxy processes
PLUGIN_MAINTAINER= frank.brendel@eurolog.com

1
net/google-cloud-sdk/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= google-cloud-sdk
PLUGIN_VERSION= 1.0
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Google Cloud SDK
PLUGIN_DEPENDS= google-cloud-sdk
PLUGIN_MAINTAINER= opnsense@moov.de

1
net/haproxy/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= haproxy
PLUGIN_VERSION= 2.26
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Reliable, high performance TCP/HTTP load balancer
PLUGIN_DEPENDS= haproxy
PLUGIN_MAINTAINER= opnsense@moov.de

0
net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/lib/haproxy/__init__.py Normal file → Executable file
View file

0
net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/lib/haproxy/cmds.py Normal file → Executable file
View file

0
net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/lib/haproxy/conn.py Normal file → Executable file
View file

0
net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/lib/haproxy/const.py Normal file → Executable file
View file

0
net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/lib/haproxy/tests/__init__.py Normal file → Executable file
View file

0
net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/lib/haproxy/tests/test_cmds.py Normal file → Executable file
View file

2
net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/lib/haproxy/tests/test_conn.py Normal file → Executable file
View file

@ -56,4 +56,4 @@ class TestConnection(unittest.TestCase):
pass
if __name__ == '__main__':
unittest.main()
unittest.main()

1
net/igmp-proxy/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= igmp-proxy
PLUGIN_VERSION= 1.5
PLUGIN_REVISION= 1
PLUGIN_DEPENDS= igmpproxy
PLUGIN_COMMENT= IGMP-Proxy Service
PLUGIN_MAINTAINER= franco@opnsense.org

11
net/mdns-repeater/Makefile
View file

@ -1,7 +1,8 @@
PLUGIN_NAME= mdns-repeater
PLUGIN_VERSION= 1.0
PLUGIN_COMMENT= Proxy multicast DNS between networks
PLUGIN_MAINTAINER= franz.fabian.94@gmail.com
PLUGIN_DEPENDS= mdns-repeater
PLUGIN_NAME= mdns-repeater
PLUGIN_VERSION= 1.0
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Proxy multicast DNS between networks
PLUGIN_MAINTAINER= franz.fabian.94@gmail.com
PLUGIN_DEPENDS= mdns-repeater
.include "../../Mk/plugins.mk"

1
net/ntopng/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= ntopng
PLUGIN_VERSION= 1.2
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Traffic Analysis and Flow Collection
PLUGIN_DEPENDS= ntopng
PLUGIN_MAINTAINER= m.muenz@gmail.com

1
net/relayd/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= relayd
PLUGIN_VERSION= 2.4
PLUGIN_REVISION= 1
PLUGIN_DEPENDS= relayd
PLUGIN_COMMENT= Relayd Load Balancer
PLUGIN_MAINTAINER= frank.brendel@eurolog.com

2
net/shadowsocks/Makefile
View file

@ -1,6 +1,6 @@
PLUGIN_NAME= shadowsocks
PLUGIN_VERSION= 1.0
PLUGIN_REVISION= 1
PLUGIN_REVISION= 2
PLUGIN_COMMENT= Secure socks5 proxy
PLUGIN_DEPENDS= shadowsocks-libev
PLUGIN_MAINTAINER= m.muenz@gmail.com

1
net/siproxd/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= siproxd
PLUGIN_VERSION= 1.3
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Siproxd is a proxy daemon for the SIP protocol
PLUGIN_DEPENDS= siproxd
PLUGIN_MAINTAINER= m.muenz@gmail.com

1
net/tayga/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= tayga
PLUGIN_VERSION= 1.1
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Tayga NAT64
PLUGIN_DEPENDS= tayga
PLUGIN_MAINTAINER= m.muenz@gmail.com

1
net/udpbroadcastrelay/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= udpbroadcastrelay
PLUGIN_VERSION= 1.0
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Control ubpbroadcastrelay processes
PLUGIN_DEPENDS= udpbroadcastrelay
PLUGIN_MAINTAINER= mjwasley@gmail.com

1
net/upnp/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= upnp
PLUGIN_VERSION= 1.4
PLUGIN_REVISION= 1
PLUGIN_DEPENDS= miniupnpd
PLUGIN_COMMENT= Universal Plug and Play Service
PLUGIN_MAINTAINER= franco@opnsense.org

1
net/vnstat/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= vnstat
PLUGIN_VERSION= 1.2
PLUGIN_REVISION= 1
PLUGIN_COMMENT= vnStat is a console-based network traffic monitor
PLUGIN_DEPENDS= vnstat
PLUGIN_MAINTAINER= m.muenz@gmail.com

2
net/wireguard/Makefile
View file

@ -1,6 +1,6 @@
PLUGIN_NAME= wireguard
PLUGIN_VERSION= 1.4
PLUGIN_REVISION= 1
PLUGIN_REVISION= 2
PLUGIN_COMMENT= WireGuard VPN service
PLUGIN_DEPENDS= wireguard
PLUGIN_MAINTAINER= m.muenz@gmail.com

1
net/wol/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= wol
PLUGIN_VERSION= 2.3
PLUGIN_REVISION= 1
PLUGIN_DEPENDS= wol
PLUGIN_COMMENT= Wake on LAN Service
PLUGIN_MAINTAINER= franco@opnsense.org

2
net/zerotier/Makefile
View file

@ -1,6 +1,6 @@
PLUGIN_NAME= zerotier
PLUGIN_VERSION= 1.3.2
PLUGIN_REVISION= 2
PLUGIN_REVISION= 3
PLUGIN_COMMENT= Virtual Networks That Just Work
PLUGIN_DEPENDS= zerotier
PLUGIN_MAINTAINER= dharrigan@gmail.com

2
security/acme-client/Makefile
View file

@ -1,5 +1,5 @@
PLUGIN_NAME= acme-client
PLUGIN_VERSION= 2.3
PLUGIN_VERSION= 2.4
PLUGIN_COMMENT= Let's Encrypt client
PLUGIN_MAINTAINER= opnsense@moov.de
PLUGIN_DEPENDS= acme.sh py${PLUGIN_PYTHON}-dns-lexicon

17
security/acme-client/pkg-descr
View file

@ -8,6 +8,23 @@ WWW: https://github.com/acmesh-official/acme.sh
Plugin Changelog
================
2.4
Added:
* add new page to show AcmeClient entries from system log
* add tooltips for certificate command buttons (#2188)
Fixed:
* fix missing "--ecc" parameter when renewing ECC certs (#2223)
* fix log file location (#2227)
* fix GUI log formatting (by using the syslog log)
* fix OCSP setting not honored (#2234)
Changed:
* let acme.sh log through syslog
* revamp logs page, move acme.sh log to a sub tab
* remove legacy logs page
2.3
Added:

9
security/acme-client/src/etc/inc/plugins.inc.d/acmeclient.inc
View file

@ -71,6 +71,15 @@ function acmeclient_services()
return $services;
}
function acmeclient_syslog()
{
$logfacilities = array();
$logfacilities['acmeclient'] = array(
'facility' => array('acmeclient', 'acme.sh')
);
return $logfacilities;
}
/**
* NOTE: Does NOT support configuration sync (xmlrpc). The required acme.sh
* state files are missing on the secondary node and thus all attempts

45
security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/LogsController.php Normal file
View file

@ -0,0 +1,45 @@
<?php
/**
* Copyright (C) 2021 Frank Wall
* Copyright (C) 2015 Deciso B.V.
*
* All rights reserved.
*
* 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 ``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 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.
*
*/
namespace OPNsense\AcmeClient;
/**
* Class LogsController
* @package OPNsense\AcmeClient
*/
class LogsController extends \OPNsense\Base\IndexController
{
public function indexAction()
{
// choose template
$this->view->pick('OPNsense/AcmeClient/logs');
}
}

9
security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeCertificate.php
View file

@ -344,11 +344,11 @@ class LeCertificate extends LeCommon
// Check if called by auto renewal process.
if (($acme_action == 'renew') and ($this->cron == 1) and ($auto_renewal == 0)) {
LeUtils::log('auto renewal is globally disabled, skipping certificate: ' . (string)$this->config->name);
return false;
LeUtils::log('auto renewal is globally disabled, skipping certificate: ' . (string)$this->config->name);
return false;
} elseif (($acme_action == 'renew') and ($this->cron == 1) and ((string)$this->config->autoRenewal == 0)) {
LeUtils::log('auto renewal is disabled for certificate: ' . (string)$this->config->name);
return false;
LeUtils::log('auto renewal is disabled for certificate: ' . (string)$this->config->name);
return false;
}
LeUtils::log("${acme_action} certificate: " . (string)$this->config->name);
@ -656,6 +656,7 @@ class LeCertificate extends LeCommon
$val->setNames($this->config->name, $this->config->altNames, $this->config->aliasmode, $this->config->domainalias, $this->config->challengealias);
$val->setRenewal((int)$this->config->renewInterval);
$val->setForce($this->force);
$val->setOcsp((string)$this->config->ocsp == 1 ? true : false);
// strip prefix from key value
$val->setKey(substr($this->config->keyLength, 4));
$val->prepare();

10
security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeCommon.php
View file

@ -153,26 +153,36 @@ abstract class LeCommon
switch ($loglevel) {
case 'extended':
$this->acme_args[] = '--syslog 6';
$this->acme_args[] = '--log-level 2';
$this->debug = false;
break;
case 'debug':
$this->acme_args[] = '--syslog 7';
$this->acme_args[] = '--debug';
$this->debug = true;
break;
case 'debug2':
$this->acme_args[] = '--syslog 7';
$this->acme_args[] = '--debug 2';
$this->debug = true;
break;
case 'debug3':
$this->acme_args[] = '--syslog 7';
$this->acme_args[] = '--debug 3';
$this->debug = true;
break;
default:
$this->acme_args[] = '--syslog 6';
$this->acme_args[] = '--log-level 1';
$this->debug = false;
break;
}
// Set log file
// NOTE: This log file is no longer exposed to the GUI. However, it may
// still turn out to be useful for debug purposes in rare egde cases.
$this->acme_args[] = LeUtils::execSafe('--log %s', self::ACME_LOG_FILE);
}
/**

2
security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/Base.php
View file

@ -137,7 +137,7 @@ abstract class Base extends \OPNsense\AcmeClient\LeCommon
if ($this->cert_keylength == 'ec256' || $this->cert_keylength == 'ec384') {
if ($renew == true) {
// If it's a renew then pass --ecc to acme client to locate the correct cert directory
$acme_args[] = '--ecc';
$this->acme_args[] = '--ecc';
}
}

5
security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Menu/Menu.xml
View file

@ -9,7 +9,10 @@
<Validations VisibleName="Challenge Types" order="30" url="/ui/acmeclient/validations"/>
<Certificates order="40" url="/ui/acmeclient/certificates"/>
<Automations VisibleName="Automations" order="50" url="/ui/acmeclient/actions"/>
<LogFile VisibleName="Log File" order="60" url="/diag_logs_acmeclient.php"/>
<Logs VisibleName="Log Files" order="60" url="/ui/acmeclient/logs">
<SystemLog VisibleName="System Log" order="10" url="/ui/acmeclient/logs"/>
<AcmeLog VisibleName="Acme Log" order="20" url="/ui/diagnostics/log/core/acmeclient"/>
</Logs>
</LEAcmeClient>
</Services>
</menu>

14
security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/certificates.volt
View file

@ -59,13 +59,13 @@ POSSIBILITY OF SUCH DAMAGE.
url: '/api/acmeclient/certificates/search',
formatters: {
"commands": function (column, row) {
return "<button type=\"button\" class=\"btn btn-xs btn-default command-edit\" data-row-id=\"" + row.uuid + "\"><span class=\"fa fa-pencil\"></span></button> " +
"<button type=\"button\" class=\"btn btn-xs btn-default command-copy\" data-row-id=\"" + row.uuid + "\"><span class=\"fa fa-clone\"></span></button>" +
"<button type=\"button\" class=\"btn btn-xs btn-default command-sign\" data-row-id=\"" + row.uuid + "\"><span class=\"fa fa-repeat\"></span></button>" +
"<button type=\"button\" class=\"btn btn-xs btn-default command-automation\" data-row-id=\"" + row.uuid + "\"><span class=\"fa fa-paper-plane\"></span></button>" +
"<button type=\"button\" class=\"btn btn-xs btn-default command-revoke\" data-row-id=\"" + row.uuid + "\"><span class=\"fa fa-power-off\"></span></button>" +
"<button type=\"button\" class=\"btn btn-xs btn-default command-removekey\" data-row-id=\"" + row.uuid + "\"><span class=\"fa fa-history\"></span></button>" +
"<button type=\"button\" class=\"btn btn-xs btn-default command-delete\" data-row-id=\"" + row.uuid + "\"><span class=\"fa fa-trash-o\"></span></button>";
return "<button type=\"button\" title=\"{{ lang._('edit certificate') }}\" class=\"btn btn-xs btn-default command-edit\" data-row-id=\"" + row.uuid + "\"><span class=\"fa fa-pencil\"></span></button> " +
"<button type=\"button\" title=\"{{ lang._('copy certificate') }}\" class=\"btn btn-xs btn-default command-copy\" data-row-id=\"" + row.uuid + "\"><span class=\"fa fa-clone\"></span></button>" +
"<button type=\"button\" title=\"{{ lang._('issue or renew certificate') }}\" class=\"btn btn-xs btn-default command-sign\" data-row-id=\"" + row.uuid + "\"><span class=\"fa fa-repeat\"></span></button>" +
"<button type=\"button\" title=\"{{ lang._('run automations') }}\" class=\"btn btn-xs btn-default command-automation\" data-row-id=\"" + row.uuid + "\"><span class=\"fa fa-paper-plane\"></span></button>" +
"<button type=\"button\" title=\"{{ lang._('revoke certificate') }}\" class=\"btn btn-xs btn-default command-revoke\" data-row-id=\"" + row.uuid + "\"><span class=\"fa fa-power-off\"></span></button>" +
"<button type=\"button\" title=\"{{ lang._('reset certificate') }}\" class=\"btn btn-xs btn-default command-removekey\" data-row-id=\"" + row.uuid + "\"><span class=\"fa fa-history\"></span></button>" +
"<button type=\"button\" title=\"{{ lang._('remove certificate') }}\" class=\"btn btn-xs btn-default command-delete\" data-row-id=\"" + row.uuid + "\"><span class=\"fa fa-trash-o\"></span></button>";
},
"rowtoggle": function (column, row) {
if (parseInt(row[column.id], 2) == 1) {

130
security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/logs.volt Normal file
View file

@ -0,0 +1,130 @@
{#
# Copyright (c) 2019 Deciso B.V.
# All rights reserved.
#
# 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 ``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 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.
#}
<script>
$( document ).ready(function() {
// get entries from system log for 'AcmeClient'
let grid_systemlog = $("#grid-systemlog").UIBootgrid({
options:{
// Hide nonfunctional search field
navigation:2,
sorting:false,
rowSelect: false,
selection: false,
rowCount:[20,50,100,200,500,1000,-1],
requestHandler: function(request){
// Show only log entries that match 'AcmeClient'
request['searchPhrase'] = 'AcmeClient';
return request;
},
},
search:'/api/diagnostics/log/core/system'
});
// get entries from acmeclient.log
let grid_acmelog = $("#grid-acmelog").UIBootgrid({
options:{
sorting:false,
rowSelect: false,
selection: false,
rowCount:[20,50,100,200,500,1000,-1],
},
search:'/api/diagnostics/log/core/acmeclient'
});
grid_systemlog.on("loaded.rs.jquery.bootgrid", function(){
$(".action-page").click(function(event){
event.preventDefault();
$("#grid-systemlog").bootgrid("search", "");
let new_page = parseInt((parseInt($(this).data('row-id')) / $("#grid-log").bootgrid("getRowCount")))+1;
$("input.search-field").val("");
// XXX: a bit ugly, but clearing the filter triggers a load event.
setTimeout(function(){
$("ul.pagination > li:last > a").data('page', new_page).click();
}, 100);
});
});
grid_acmelog.on("loaded.rs.jquery.bootgrid", function(){
$(".action-page").click(function(event){
event.preventDefault();
$("#grid-acmelog").bootgrid("search", "");
let new_page = parseInt((parseInt($(this).data('row-id')) / $("#grid-log").bootgrid("getRowCount")))+1;
$("input.search-field").val("");
// XXX: a bit ugly, but clearing the filter triggers a load event.
setTimeout(function(){
$("ul.pagination > li:last > a").data('page', new_page).click();
}, 100);
});
});
});
</script>
<ul class="nav nav-tabs" role="tablist" id="maintabs">
<li class="active"><a data-toggle="tab" href="#systemlog"><b>{{ lang._('System Log') }}</b></a></li>
<li><a data-toggle="tab" href="#acmelog">{{ lang._('Acme Log') }}</a></li>
</ul>
<div class="content-box tab-content">
<div id="systemlog" class="tab-pane fade in active">
<div class="content-box" style="padding-bottom: 1.5em;">
<div class="col-sm-12">
<table id="grid-systemlog" class="table table-condensed table-hover table-striped table-responsive" data-store-selection="true">
<thead>
<tr>
<th data-column-id="timestamp" data-width="11em" data-type="string">{{ lang._('Date') }}</th>
<th data-column-id="process_name" data-width="11em" data-type="string">{{ lang._('Process') }}</th>
<th data-column-id="line" data-type="string">{{ lang._('Line') }}</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
</div>
</div>
<div id="acmelog" class="tab-pane fade">
<div class="content-box" style="padding-bottom: 1.5em;">
<div class="col-sm-12">
<table id="grid-acmelog" class="table table-condensed table-hover table-striped table-responsive" data-store-selection="true">
<thead>
<tr>
<th data-column-id="timestamp" data-width="11em" data-type="string">{{ lang._('Date') }}</th>
<th data-column-id="process_name" data-width="11em" data-type="string">{{ lang._('Process') }}</th>
<th data-column-id="line" data-type="string">{{ lang._('Line') }}</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
</div>
</div>
</div>

63
security/acme-client/src/opnsense/scripts/systemhealth/logformats/acmeclient.py Executable file
View file

@ -0,0 +1,63 @@
"""
Copyright (c) 2021 Frank Wall
Copyright (c) 2020 Ad Schellevis <ad@opnsense.org>
All rights reserved.
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 ``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 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.
"""
import re
import datetime
from . import BaseLogFormat
class AcmeclientLogFormat(BaseLogFormat):
def __init__(self, filename):
super(AcmeclientLogFormat, self).__init__(filename)
# XXX This is ugly, but it's the only way to override the line() method.
self._priority = 1
self._startup_timestamp = datetime.datetime.now()
def match(self, line):
return self._filename.find('acmeclient') > -1 and len(line) > 15 and re.match(r'(?:[01]\d|2[0123]):(?:[012345]\d):(?:[012345]\d)', line[7:15])
def timestamp(self, line):
# syslog format, strip timestamp and return actual log data
ts = datetime.datetime.strptime("%s %s" % (self._startup_timestamp.year, line[0:15]), "%Y %b %d %H:%M:%S")
ts = ts.replace(year=self._startup_timestamp.year)
if (self._startup_timestamp - ts).days < 0:
# likely previous year, (month for this year not reached yet)
ts = ts.replace(year=ts.year - 1)
return ts.isoformat()
@staticmethod
def line(line):
# parse [date] [hostname] [process_name] [line] format
response = line[16:]
tmp = response.find(':')
pre = response[tmp+1:].strip() if tmp > -1 else response[response.find(' ')+1:].strip()
# strip the duplicate date from the line
return pre[30:].strip()
@staticmethod
def process_name(line):
response = line[16:]
tmp = response.find(':')
return response[:tmp].strip().split()[-1] if tmp > -1 else ""

2
security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/lighttpd-acme-challenge.conf
View file

@ -10,7 +10,7 @@ server.network-backend = "writev"
#server.use-ipv6 = "enable"
# modules to load
server.modules = ( "mod_access", "mod_expire", "mod_compress", "mod_redirect",
server.modules = ( "mod_access", "mod_expire", "mod_deflate", "mod_redirect",
"mod_alias", "mod_rewrite"
)

7
security/acme-client/src/www/diag_logs_acmeclient.php
View file

@ -1,7 +0,0 @@
<?php
$logfile = '/var/log/acme.sh.log';
$logclog = false;
$logsplit = 6;
require_once 'diag_logs_template_acme-client.inc';

117
security/acme-client/src/www/diag_logs_template_acme-client.inc
View file

@ -1,117 +0,0 @@
<?php
/*
* Copyright (C) 2014-2015 Deciso B.V.
* Copyright (C) 2012 Seth Mos <seth.mos@dds.nl>
* Copyright (C) 2004-2009 Scott Ullrich <sullrich@gmail.com>
* Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>
* All rights reserved.
*
* 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 ``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 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.
*/
require_once("guiconfig.inc");
require_once("system.inc");
require_once("interfaces.inc");
/* expects $logfile to point to the system path */
/* expects $logclog to be true or false */
require_once 'diag_logs_common.inc';
$filtertext = '';
$nentries = 50;
if (isset($config['syslog']['nentries'])) {
$nentries = $config['syslog']['nentries'];
}
if (!empty($_POST['clear'])) {
if ($logclog) {
system_clear_clog($logfile);
} else {
system_clear_log($logfile);
}
}
if (isset($_POST['filtertext'])) {
$filtertext = $_POST['filtertext'];
}
include("head.inc");
?>
<body>
<?php include("fbegin.inc"); ?>
<section class="page-content-main">
<div class="container-fluid">
<div class="row">
<section class="col-xs-12">
<p>
<form method="post">
<div class="input-group">
<div class="input-group-addon"><i class="fa fa-search"></i></div>
<input type="text" class="form-control" id="filtertext" name="filtertext" placeholder="<?= html_safe(gettext('Search for a specific message...')) ?>" value="<?= html_safe($filtertext) ?>"/>
</div>
</form>
</p>
<div class="table-responsive content-box tab-content">
<table class="table table-striped">
<tr>
<th class="col-md-2 col-sm-3 col-xs-4"><?= gettext('Date') ?></th>
<th class="col-md-10 col-sm-9 col-xs-8"><?= gettext('Message') ?></th>
</tr>
<?php if (isset($logpills)): ?>
<tr>
<td colspan="2">
<ul class="nav nav-pills" role="tablist">
<?php foreach ($logpills as $pill): ?>
<li role="presentation" <?php if (str_replace('amp;','', $pill[2]) == $_SERVER['REQUEST_URI']):?>class="active"<?php endif; ?>><a href="<?=$pill[2];?>"><?=$pill[0];?></a></li>
<?php endforeach; ?>
</ul>
</td>
</tr>
<?php endif; ?>
<?php
if ($logclog) {
dump_clog($logfile, $nentries, $filtertext);
} else {
dump_log($logfile, $nentries, $filtertext);
}
?>
<tr>
<td colspan="2">
<form method="post">
<?php if (isset($mode)): ?>
<input type="hidden" name="mode" id="mode" value="<?= html_safe($mode) ?>"/>
<?php endif; ?>
<input name="clear" type="submit" class="btn btn-primary" value="<?= html_safe(gettext('Clear log')) ?>"/>
</form>
</td>
</tr>
</table>
</div>
</section>
</div>
</div>
</section>
<?php include("foot.inc"); ?>

1
security/clamav/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= clamav
PLUGIN_VERSION= 1.7
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Antivirus engine for detecting malicious threats
PLUGIN_DEPENDS= clamav
PLUGIN_MAINTAINER= m.muenz@gmail.com

2
security/etpro-telemetry/Makefile
View file

@ -1,6 +1,6 @@
PLUGIN_NAME= etpro-telemetry
PLUGIN_VERSION= 1.4
PLUGIN_REVISION= 1
PLUGIN_REVISION= 2
PLUGIN_COMMENT= ET Pro Telemetry Edition
PLUGIN_MAINTAINER= ad@opnsense.org
PLUGIN_WWW= https://docs.opnsense.org/manual/etpro_telemetry.html

1
security/intrusion-detection-content-et-pro/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= intrusion-detection-content-et-pro
PLUGIN_VERSION= 1.0.2
PLUGIN_REVISION= 1
PLUGIN_COMMENT= IDS Proofpoint ET Pro ruleset (needs a valid subscription)
PLUGIN_MAINTAINER= ad@opnsense.org
PLUGIN_WWW= https://www.proofpoint.com/us/threat-insight/et-pro-ruleset

1
security/intrusion-detection-content-pt-open/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= intrusion-detection-content-pt-open
PLUGIN_VERSION= 1.0
PLUGIN_REVISION= 1
PLUGIN_COMMENT= IDS PT Research ruleset (only for non-commercial use)
PLUGIN_MAINTAINER= ad@opnsense.org
PLUGIN_WWW= https://www.ptsecurity.com/ww-en/

1
security/intrusion-detection-content-snort-vrt/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= intrusion-detection-content-snort-vrt
PLUGIN_VERSION= 1.1
PLUGIN_REVISION= 1
PLUGIN_COMMENT= IDS Snort VRT ruleset (needs registration or subscription)
PLUGIN_MAINTAINER= ad@opnsense.org
PLUGIN_WWW= https://www.snort.org/downloads#rules

1
security/maltrail/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= maltrail
PLUGIN_VERSION= 1.6
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Malicious traffic detection system
PLUGIN_DEPENDS= maltrail
PLUGIN_MAINTAINER= m.muenz@gmail.com

1
security/openconnect/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= openconnect
PLUGIN_VERSION= 1.4.0
PLUGIN_REVISION= 1
PLUGIN_COMMENT= OpenConnect Client
PLUGIN_DEPENDS= openconnect
PLUGIN_MAINTAINER= m.muenz@gmail.com

1
security/softether/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= softether
PLUGIN_VERSION= 0.1
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Cross-platform Multi-protocol VPN Program
PLUGIN_DEPENDS= softether
PLUGIN_MAINTAINER= m.muenz@gmail.com

1
security/stunnel/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= stunnel
PLUGIN_VERSION= 1.0.2
PLUGIN_REVISION= 1
PLUGIN_COMMENT= stunnel TLS proxy
PLUGIN_MAINTAINER= ad@opnsense.org
PLUGIN_DEPENDS= stunnel

2
security/tinc/Makefile
View file

@ -1,6 +1,6 @@
PLUGIN_NAME= tinc
PLUGIN_VERSION= 1.6
PLUGIN_REVISION= 1
PLUGIN_REVISION= 2
PLUGIN_COMMENT= Tinc VPN
PLUGIN_DEPENDS= tinc
PLUGIN_MAINTAINER= ad@opnsense.org

4
security/tor/Makefile
View file

@ -1,8 +1,8 @@
PLUGIN_NAME= tor
PLUGIN_VERSION= 1.8
PLUGIN_REVISION= 1
PLUGIN_REVISION= 2
PLUGIN_COMMENT= The Onion Router
PLUGIN_DEPENDS= tor ruby
PLUGIN_MAINTAINER= ranz.fabian.94@gmail.com
PLUGIN_MAINTAINER= franz.fabian.94@gmail.com
.include "../../Mk/plugins.mk"

1
sysutils/api-backup/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= api-backup
PLUGIN_VERSION= 1.0
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Provide the functionality to download the config.xml
PLUGIN_MAINTAINER= franz.fabian.94@gmail.com

1
sysutils/apuled/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= apuled
PLUGIN_VERSION= 0.2
PLUGIN_REVISION= 1
PLUGIN_DEVEL= yes
PLUGIN_COMMENT= PC Engine APU LED control
PLUGIN_MAINTAINER= julio@cloudfence.com.br

1
sysutils/boot-delay/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= boot-delay
PLUGIN_VERSION= 1.0
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Apply a persistent 10 second boot delay
PLUGIN_MAINTAINER= franco@opnsense.org

1
sysutils/dmidecode/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= dmidecode
PLUGIN_VERSION= 1.1
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Display hardware information on the dashboard
PLUGIN_DEPENDS= dmidecode
PLUGIN_MAINTAINER= evbevz@gmail.com

11
sysutils/git-backup/Makefile
View file

@ -1,7 +1,8 @@
PLUGIN_NAME= git-backup
PLUGIN_VERSION= 1.0
PLUGIN_COMMENT= Track config changes using git
PLUGIN_DEPENDS= git
PLUGIN_MAINTAINER= ad@opnsense.org
PLUGIN_NAME= git-backup
PLUGIN_VERSION= 1.0
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Track config changes using git
PLUGIN_DEPENDS= git
PLUGIN_MAINTAINER= ad@opnsense.org
.include "../../Mk/plugins.mk"

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