public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0742747e6dc4416f5a7c7b7feabdcb639a8b5f55
@ 2024-01-19 16:39 Michael Tremer
  0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2024-01-19 16:39 UTC (permalink / raw)
  To: ipfire-scm

[-- Attachment #1: Type: text/plain, Size: 23667 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  0742747e6dc4416f5a7c7b7feabdcb639a8b5f55 (commit)
       via  e5a77641f35ec41e2b4a20403e690f0c9c96cb42 (commit)
       via  b87cd867f704a5dbe1f28f448176f8a29950d709 (commit)
       via  295af8f7666bcae0a8d05fae4824e803c0c523ff (commit)
       via  c981c48b2da9330445edb1491fcfed4c807e8afe (commit)
       via  9d30f138f9508bf9fffab7a913972ddced287a87 (commit)
       via  0e415928b72a1e3c01bc01fb800d8f5e9342f0bd (commit)
       via  dbf1d1634be473f02323f030ee0625d59bc3c351 (commit)
      from  6094f35b5aea86b80e761302f83dc8c09a52b63b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0742747e6dc4416f5a7c7b7feabdcb639a8b5f55
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Jan 19 16:38:12 2024 +0000

    core183: Ship firewall initscript
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit e5a77641f35ec41e2b4a20403e690f0c9c96cb42
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date:   Tue Jan 16 16:26:39 2024 +0100

    Firewall initscript: Restore Tor IPTable rules by manual firewall restart
    
    If the firewall will be manually restart via '/etc/init.d/firewall restart',
    the IPTable rules for the Tor relay will be deleted since 'iptables_init' only
    flushes and creates inbound and unbound chains for Tor but does not restore the
    ruleset from Tor initscript.
    
    For reference and tests please see -->
    https://community.ipfire.org/t/tor-stop-working-without-stop-the-process-or-give-an-error-message/10697
    
    Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit b87cd867f704a5dbe1f28f448176f8a29950d709
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Jan 19 16:36:58 2024 +0000

    network: Only try to restart collectd if it is running
    
    This updated version of this script avoids any errors if collectd is not
    running (yet) which might happen during the boot process.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 295af8f7666bcae0a8d05fae4824e803c0c523ff
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Jan 19 16:32:24 2024 +0000

    core183: Ship the updated theme
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit c981c48b2da9330445edb1491fcfed4c807e8afe
Merge: 6094f35b5 9d30f138f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Jan 19 16:29:46 2024 +0000

    Merge remote-tracking branch 'ms/theme' into next

commit 9d30f138f9508bf9fffab7a913972ddced287a87
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Jan 10 12:25:33 2024 +0000

    index.cgi: Remove some custom CSS styling that broke the design
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 0e415928b72a1e3c01bc01fb800d8f5e9342f0bd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Jan 10 12:23:15 2024 +0000

    web-user-interface: Replace the old tux logo with out new word mark
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit dbf1d1634be473f02323f030ee0625d59bc3c351
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Jan 10 12:12:32 2024 +0000

    web-user-interface: Update interface design
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/cfgroot/header.pl                           |  10 +-
 config/rootfiles/common/web-user-interface         |   9 +-
 config/rootfiles/core/183/filelists/files          |   2 +
 .../112 => core/183}/filelists/web-user-interface  |   0
 config/rootfiles/core/183/update.sh                |   1 +
 html/cgi-bin/index.cgi                             |   6 +-
 html/html/themes/ipfire/images/n2.gif              | Bin 449 -> 0 bytes
 html/html/themes/ipfire/images/n3.gif              | Bin 155 -> 0 bytes
 html/html/themes/ipfire/images/n5.gif              | Bin 72 -> 0 bytes
 html/html/themes/ipfire/images/n6.gif              | Bin 70 -> 0 bytes
 html/html/themes/ipfire/images/tux2.png            | Bin 9640 -> 0 bytes
 html/html/themes/ipfire/include/css/style.css      | 204 +++++++++++----------
 .../themes/ipfire/include/fonts/Prompt-Bold.ttf    | Bin 0 -> 178804 bytes
 .../themes/ipfire/include/fonts/Prompt-Medium.ttf  | Bin 0 -> 176444 bytes
 .../themes/ipfire/include/fonts/Prompt-Regular.ttf | Bin 0 -> 168932 bytes
 html/html/themes/ipfire/include/functions.pl       |  11 +-
 src/initscripts/networking/red.up/60-collectd      |   6 +-
 src/initscripts/system/firewall                    |   8 +
 18 files changed, 133 insertions(+), 124 deletions(-)
 copy config/rootfiles/{oldcore/112 => core/183}/filelists/web-user-interface (100%)
 delete mode 100644 html/html/themes/ipfire/images/n2.gif
 delete mode 100644 html/html/themes/ipfire/images/n3.gif
 delete mode 100644 html/html/themes/ipfire/images/n5.gif
 delete mode 100644 html/html/themes/ipfire/images/n6.gif
 delete mode 100644 html/html/themes/ipfire/images/tux2.png
 create mode 100644 html/html/themes/ipfire/include/fonts/Prompt-Bold.ttf
 create mode 100644 html/html/themes/ipfire/include/fonts/Prompt-Medium.ttf
 create mode 100644 html/html/themes/ipfire/include/fonts/Prompt-Regular.ttf

Difference in files:
diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 3f80ce9b4..5164e9731 100644
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -26,13 +26,9 @@ $Header::revision = 'final';
 $Header::swroot = '/var/ipfire';
 $Header::graphdir='/srv/web/ipfire/html/graphs';
 $Header::pagecolour = '#ffffff';
-#$Header::tablecolour = '#a0a0a0';
-$Header::tablecolour = '#FFFFFF';
-$Header::bigboxcolour = '#F6F4F4';
-$Header::boxcolour = '#EAE9EE';
-$Header::bordercolour = '#000000';
-$Header::table1colour = '#E0E0E0';
-$Header::table2colour = '#F0F0F0';
+$Header::bordercolour = '#363636';
+$Header::table1colour = '#f5f5f5';
+$Header::table2colour = '#fafafa';
 $Header::colourred = '#993333';
 $Header::colourorange = '#FF9933';
 $Header::colouryellow = '#FFFF00';
diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface
index 6c2a40cc2..49f7dc9ea 100644
--- a/config/rootfiles/common/web-user-interface
+++ b/config/rootfiles/common/web-user-interface
@@ -344,16 +344,13 @@ srv/web/ipfire/html/redirect-templates/legacy/template.html
 srv/web/ipfire/html/redirect.cgi
 srv/web/ipfire/html/themes
 srv/web/ipfire/html/themes/ipfire
-srv/web/ipfire/html/themes/ipfire/images
-srv/web/ipfire/html/themes/ipfire/images/n2.gif
-srv/web/ipfire/html/themes/ipfire/images/n3.gif
-srv/web/ipfire/html/themes/ipfire/images/n5.gif
-srv/web/ipfire/html/themes/ipfire/images/n6.gif
-srv/web/ipfire/html/themes/ipfire/images/tux2.png
 srv/web/ipfire/html/themes/ipfire/include
 srv/web/ipfire/html/themes/ipfire/include/colors.txt
 srv/web/ipfire/html/themes/ipfire/include/css
 srv/web/ipfire/html/themes/ipfire/include/css/style.css
+srv/web/ipfire/html/themes/ipfire/include/fonts/Prompt-Bold.ttf
+srv/web/ipfire/html/themes/ipfire/include/fonts/Prompt-Medium.ttf
+srv/web/ipfire/html/themes/ipfire/include/fonts/Prompt-Regular.ttf
 srv/web/ipfire/html/themes/ipfire/include/functions.pl
 srv/web/ipfire/html/themes/ipfire/include/js
 srv/web/ipfire/html/themes/ipfire/include/js/refreshInetInfo.js
diff --git a/config/rootfiles/core/183/filelists/files b/config/rootfiles/core/183/filelists/files
index 42ddf682e..8839504f4 100644
--- a/config/rootfiles/core/183/filelists/files
+++ b/config/rootfiles/core/183/filelists/files
@@ -1,3 +1,4 @@
+etc/rc.d/init.d/firewall
 etc/rc.d/init.d/mountfs
 etc/rc.d/init.d/networking/red.up/60-collectd
 srv/web/ipfire/cgi-bin/dhcp.cgi
@@ -5,3 +6,4 @@ srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
 usr/local/bin/backupiso
 var/ipfire/backup/bin/backup.pl
+var/ipfire/header.pl
diff --git a/config/rootfiles/core/183/filelists/web-user-interface b/config/rootfiles/core/183/filelists/web-user-interface
new file mode 120000
index 000000000..70c74b438
--- /dev/null
+++ b/config/rootfiles/core/183/filelists/web-user-interface
@@ -0,0 +1 @@
+../../../common/web-user-interface
\ No newline at end of file
diff --git a/config/rootfiles/core/183/update.sh b/config/rootfiles/core/183/update.sh
index 51483bb7d..77446311a 100644
--- a/config/rootfiles/core/183/update.sh
+++ b/config/rootfiles/core/183/update.sh
@@ -94,6 +94,7 @@ extract_files
 # Remove files
 rm -rvf \
 	/etc/fonts/conf.d/10-sub-pixel-rgb.conf \
+	/srv/web/ipfire/html/themes/ipfire/images \
 	/usr/lib/libbind9-9.16.44.so \
 	/usr/lib/libdns-9.16.44.so \
 	/usr/lib/libirs-9.16.44.so \
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index adec877cb..65773244c 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -173,9 +173,9 @@ print <<END;
 <!-- Table of networks -->
 <table class='tbl' style='width:80%;'>
   <tr>
-        <th style='background-color:$color{'color20'};'>$Lang::tr{'network'}</th>
-        <th style='background-color:$color{'color20'};'>$Lang::tr{'ip address'}</th>
-        <th style='background-color:$color{'color20'};'>$Lang::tr{'status'}</th>
+        <th>$Lang::tr{'network'}</th>
+        <th>$Lang::tr{'ip address'}</th>
+        <th>$Lang::tr{'status'}</th>
   </tr>
   <tr>
         <td style='width:25%; text-align:center; background-color:$Header::colourred;'><a href='/cgi-bin/pppsetup.cgi' style='color:white;'><b>$Lang::tr{'internet'}</b></a><br/></td>
diff --git a/html/html/themes/ipfire/images/n2.gif b/html/html/themes/ipfire/images/n2.gif
deleted file mode 100644
index b92a19de7..000000000
Binary files a/html/html/themes/ipfire/images/n2.gif and /dev/null differ
diff --git a/html/html/themes/ipfire/images/n3.gif b/html/html/themes/ipfire/images/n3.gif
deleted file mode 100644
index 6627c91a1..000000000
Binary files a/html/html/themes/ipfire/images/n3.gif and /dev/null differ
diff --git a/html/html/themes/ipfire/images/n5.gif b/html/html/themes/ipfire/images/n5.gif
deleted file mode 100644
index a03224278..000000000
Binary files a/html/html/themes/ipfire/images/n5.gif and /dev/null differ
diff --git a/html/html/themes/ipfire/images/n6.gif b/html/html/themes/ipfire/images/n6.gif
deleted file mode 100644
index ed1781c5f..000000000
Binary files a/html/html/themes/ipfire/images/n6.gif and /dev/null differ
diff --git a/html/html/themes/ipfire/images/tux2.png b/html/html/themes/ipfire/images/tux2.png
deleted file mode 100644
index cd84ad53d..000000000
Binary files a/html/html/themes/ipfire/images/tux2.png and /dev/null differ
diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css
index 96d0519f5..7cf85d68d 100644
--- a/html/html/themes/ipfire/include/css/style.css
+++ b/html/html/themes/ipfire/include/css/style.css
@@ -5,59 +5,78 @@
 	width: 960px !important;
 }
 
+/* Fonts */
+
+(a)font-face {
+	font-family: "Prompt";
+	font-style: normal;
+	font-weight: 400;
+	src: local("Prompt Regular"), local("Prompt-Regular"), url(../fonts/Prompt-Regular.ttf) format("truetype");
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+(a)font-face {
+	font-family: "Prompt";
+	font-style: normal;
+	font-weight: 400;
+	src: local("Prompt Regular"), local("Prompt-Regular"), url(../fonts/Prompt-Regular.ttf) format("truetype");
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+(a)font-face {
+	font-family: 'Prompt';
+	font-style: normal;
+	font-weight: 500;
+	src: local("Prompt Medium"), local("Prompt-Medium"), url(../fonts/Prompt-Medium.ttf) format("truetype");
+	unicode-range:U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+(a)font-face {
+	font-family: 'Prompt';
+	font-style: normal;
+	font-weight: 500;
+	src: local("Prompt Medium"), local("Prompt-Medium"), url(../fonts/Prompt-Medium.ttf) format("truetype");
+	unicode-range:U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+(a)font-face {
+	font-family: "Prompt";
+	font-style: normal;
+	font-weight: 700;
+	src: local("Prompt Bold"), local("Prompt-Bold"), url(../fonts/Prompt-Bold.ttf) format("truetype");
+	unicode-range:U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+(a)font-face {
+	font-family: "Prompt";
+	font-style: normal;
+	font-weight: 700;
+	src: local("Prompt Bold"), local("Prompt-Bold"), url(../fonts/Prompt-Bold.ttf) format("truetype");
+	unicode-range:U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
 /* Basic Stuff */
 
 * {
 	margin: 0;
-	padding: 0;
 }
 
 html {
-	height: 100%;
+	height: 100vh;
 }
 
 body {
-	/* SVG as background image (IE9/Chrome/Safari/Opera) */
-	background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2ODQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMTAwJSIgeTE9IjEwMCUiIHgyPSIxMDAlIiB5Mj0iMCUiPgo8c3RvcCBzdG9wLWNvbG9yPSIjMDAwMDAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjODgwNDAwIiBvZmZzZXQ9IjU3JSIvPgo8L2xpbmVhckdyYWRpZW50Pgo8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSJ1cmwoI2c2ODQpIiAvPgo8L3N2Zz4=);
-
-	background-image: linear-gradient(
-		bottom,
-		#000000 0%,
-		#880400 57%
-	);
-	background-image: -o-linear-gradient(
-		bottom,
-		#000000 0%,
-		#880400 57%
-	);
-	background-image: -moz-linear-gradient(
-		bottom,
-		#000000 0%,
-		#880400 57%
-	);
-	background-image: -webkit-linear-gradient(
-		bottom,
-		#000000 0%,
-		#880400 57
-	);
-	background-image: -ms-linear-gradient(
-		bottom,
-		#000000 0%,
-		#880400 57%
-	);
-	background-image: -webkit-gradient(
-		linear,
-		left bottom,
-		left top,
-		color-stop(0, #000000),
-		color-stop(0.57, #880400)
+	background: linear-gradient(
+		#ff2e52,
+		#000000
 	);
 	background-attachment: fixed;
 
+	font-family: "Prompt", sans-serif;
 	font-size: 9pt;
-	font-family: "DejaVu Sans", Helvetica, sans-serif;
-}
 
+	color: #363636;
+}
 
 h1, h2, h3, h4, h5, h6 {
 	font-size: 20px;
@@ -66,10 +85,6 @@ h1, h2, h3, h4, h5, h6 {
 	text-align: left;
 }
 
-h1 {
-	color: #66000F;
-}
-
 br.clear {
 	clear: both;
 }
@@ -80,7 +95,7 @@ img {
 
 a {
 	text-decoration: underline;
-	color: #d90000;
+	color: #ff2e52;
 }
 
 a:hover {
@@ -106,7 +121,6 @@ iframe {
 /* Header */
 
 #header {
-	height: 70px;
 	margin: 0 auto;
 }
 
@@ -118,11 +132,14 @@ iframe {
 }
 
 #logo h1 {
-	color: #fff;
-	font-size: 3.6em;
+	color: #ffffff;
+	font-size: 3.5em;
 	font-weight: bold;
-	padding-top: 0.2em;
-	padding-left: 1.7em;
+}
+
+#logo h1 a {
+	color: inherit;
+	text-decoration: none;
 }
 
 /* Main */
@@ -131,11 +148,10 @@ iframe {
 	margin: 0 auto;
 	margin-top: 0.5em;
 	padding: 1.5em 2em 0 2em;
-	background: #fff url('../../images/n2.gif') 0px 0px repeat-x;
-	border: 1px solid black;
+	background: #ffffff;
 
+	border: 2px solid black;
 	border-radius: 3px 3px 3px 3px;
-	-webkit-border-radius: 3px 3px 3px 3px;
 }
 
 #main_inner {
@@ -184,7 +200,8 @@ iframe {
 
 #footer {
 	height: 2.5em;
-	margin-bottom: 1em;
+	margin-bottom: 1.5em;
+	padding-bottom: 0.5em;
 }
 
 #footer a {
@@ -196,24 +213,6 @@ iframe {
 	text-decoration: underline;
 }
 
-input {
-	margin: 0.2em;
-}
-
-input.button {
-	background: #ca2f2f url('../../images/n3.gif') repeat-x;
-	color: #fff;
-	border: solid 1px #a94b4b;
-	font-weight: bold;
-	font-size: 0.8em;
-	height: 2.0em;
-}
-
-input.text {
-	border: solid 1px #f1f1f1;
-	padding: 0.25em;
-}
-
 #traffic {
 	float: right;
 	min-width: 20em;
@@ -222,16 +221,13 @@ input.text {
 
 /* Menu */
 #cssmenu {
-	margin: 0 auto;
-	margin-top: 0;
 	padding-top: 0;
-	font-weight: 600;
+	font-weight: 500;
 	height: 32px;
-	border: 1px solid black;
 }
 
 #cssmenu a {
-	color: #111111;
+	color: #363636;
 	display: inline-block;
 	line-height: 32px;
 	padding: 0 1em;
@@ -240,6 +236,7 @@ input.text {
 
 #cssmenu ul {
 	list-style: none;
+	padding: 0;
 }
 
 #cssmenu > ul > li {
@@ -247,8 +244,8 @@ input.text {
 }
 
 #cssmenu > ul > li.active a, #cssmenu > ul > li:hover > a {
-	color: white;
-	background: #aaaaaa;
+	color: #ffffff;
+	background: #363636;
 }
 
 #cssmenu .has-sub:hover > ul {
@@ -264,7 +261,7 @@ input.text {
 #cssmenu .has-sub ul li a {
 	min-width: 12em;
 	background: #ffffff;
-	color: grey;
+	color: #363636;
 	display: block;
 	line-height: 40%;
 	padding: 12px 5px;
@@ -272,7 +269,8 @@ input.text {
 }
 
 #cssmenu .has-sub ul li:hover a {
-	background: #dddddd;
+	color: #ffffff;
+	background: #363636;
 }
 
 /* This decorates all tables with class="tbl" */
@@ -283,59 +281,60 @@ table {
 }
 
 .tbl th {
-	color: #000000;
-	border-top: 1px solid lightgrey;
-	border-bottom: 1px solid lightgrey;
-	background: #cccccc;
+	color: #ffffff;
+	border-top: 1px solid #363636;
+	border-bottom: 1px solid #363636;
+	background: #363636;
 	padding-left: 0.5em;
 	padding-right: 0.5em;
 }
 
 .tbl th:first-child {
-	border-left: 1px solid lightgrey;
-	border-top: 1px solid lightgrey;
-	border-bottom: 1px solid lightgrey;
+	border-left: 1px solid #363636;
+	border-top: 1px solid #363636;
+	border-bottom: 1px solid #363636;
 }
 
 .tbl th:last-child {
-	border-right: 1px solid lightgrey;
-	border-top: 1px solid lightgrey;
-	border-bottom: 1px solid lightgrey;
+	border-right: 1px solid #363636;
+	border-top: 1px solid #363636;
+	border-bottom: 1px solid #363636;
 }
 
 .tbl th:only-child {
-	border: 1px solid lightgrey;
+	border: 1px solid #363636;
 }
-.tbl td{
-	padding-left: 0.5em;
-	padding-right: 0.5em;
+
+.tbl td {
+	padding: 0.25em 0.5em;
 }
+
 .tbl tr td:first-child {
-	border-left: 1px solid lightgrey;
+	border-left: 1px solid #363636;
 }
 
 .tbl tr td:last-child {
-	border-right: 1px solid lightgrey;
+	border-right: 1px solid #363636;
 }
 
 .tbl tr:first-child td {
-	border-top: 1px solid lightgrey;
+	border-top: 1px solid #363636;
 }
 
 .tbl tr:last-child td:only-child {
-	border-bottom: 1px solid lightgrey;
+	border-bottom: 1px solid #363636;
 }
 
 .tbl tr:last-child td:first-child {
-	border-bottom: 1px solid lightgrey;
+	border-bottom: 1px solid #363636;
 }
 
 .tbl tr:last-child td:last-child {
-	border-bottom: 1px solid lightgrey;
+	border-bottom: 1px solid #363636;
 }
 
 .tbl tr:last-child td {
-	border-bottom: 1px solid lightgrey;
+	border-bottom: 1px solid #363636;
 }
 
 table.fw-nat tbody tr td {
@@ -350,6 +349,7 @@ div.rrdimage > ul {
 	display: flex;
 	justify-content: center;
 }
+
 .rrdimage li:not(:first-child)::before {
 	content: "-";
 	padding: 0 0.3em;
@@ -358,16 +358,18 @@ div.rrdimage > ul {
 .rrdimage button {
 	padding: 0.3em;
 	font-weight: 700;
-	color: #d90000; /* link color */
+	color: #ff2e52;
 	border: none;
 	background: none;
 	cursor: pointer;
 	text-decoration: none;
 }
+
 .rrdimage button:focus {
 	outline: none;
 	box-shadow: none;
 }
+
 .rrdimage button.selected {
 	text-decoration: underline;
 }
diff --git a/html/html/themes/ipfire/include/fonts/Prompt-Bold.ttf b/html/html/themes/ipfire/include/fonts/Prompt-Bold.ttf
new file mode 100644
index 000000000..6cdd89b45
Binary files /dev/null and b/html/html/themes/ipfire/include/fonts/Prompt-Bold.ttf differ
diff --git a/html/html/themes/ipfire/include/fonts/Prompt-Medium.ttf b/html/html/themes/ipfire/include/fonts/Prompt-Medium.ttf
new file mode 100644
index 000000000..adf72c9f6
Binary files /dev/null and b/html/html/themes/ipfire/include/fonts/Prompt-Medium.ttf differ
diff --git a/html/html/themes/ipfire/include/fonts/Prompt-Regular.ttf b/html/html/themes/ipfire/include/fonts/Prompt-Regular.ttf
new file mode 100644
index 000000000..2a736dbba
Binary files /dev/null and b/html/html/themes/ipfire/include/fonts/Prompt-Regular.ttf differ
diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl
index cbd05d109..27693bcb3 100644
--- a/html/html/themes/ipfire/include/functions.pl
+++ b/html/html/themes/ipfire/include/functions.pl
@@ -140,17 +140,18 @@ print <<END
 	<body>
 		<div id="header" class="fixed">
 			<div id="logo">
-				<a href="https://www.ipfire.org" style="text-decoration: none;">
-					<img src="/themes/ipfire/images/tux2.png" style="float:left; margin-left: -3px; margin-top: -3px;"/>
+				<h1>
+					<a href="https://www.ipfire.org">
+						IPFire_
+					</a>
 END
 ;
 	if ($settings{'WINDOWWITHHOSTNAME'} ne 'off') {
-		print "</a><h1>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</h1>";
-	} else {
-		print "<h1>IPFire</h1></a>";
+		print "&dash; $settings{'HOSTNAME'}.$settings{'DOMAINNAME'}";
 	}
 
 print <<END
+				</h1>
 			</div>
 		</div>
 END
diff --git a/src/initscripts/networking/red.up/60-collectd b/src/initscripts/networking/red.up/60-collectd
index 0e457894f..a96543354 100644
--- a/src/initscripts/networking/red.up/60-collectd
+++ b/src/initscripts/networking/red.up/60-collectd
@@ -1,6 +1,8 @@
 #!/bin/bash
 
 # Restart collectd because the ping plugin does not re-resolve "gateway"
-exec /etc/init.d/collectd restart
+if pgrep collectd &>/dev/null; then
+	exec /etc/init.d/collectd restart &>/dev/null
+fi
 
-exit 1
+exit 0
diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall
index 50f2b3e02..3aab7dd75 100644
--- a/src/initscripts/system/firewall
+++ b/src/initscripts/system/firewall
@@ -25,6 +25,9 @@
 eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings)
 eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 eval $(/usr/local/bin/readhash /var/ipfire/optionsfw/settings)
+if [ -r "/var/ipfire/tor/settings"  ]; then
+	eval $(/usr/local/bin/readhash /var/ipfire/tor/settings)
+fi
 IFACE=`/bin/cat /var/ipfire/red/iface 2> /dev/null | /usr/bin/tr -d '\012'`
 if [ -z $IFACE ]; then
 	IFACE="red0"
@@ -387,6 +390,11 @@ iptables_init() {
 	# run captivectrl
 	/usr/local/bin/captivectrl
 
+	# If a Tor relay is enabled apply firewall rules
+	if [ "${TOR_RELAY_ENABLED}" = "on" -a -n "${TOR_RELAY_PORT}" ]; then
+		/usr/local/bin/torctrl restart 1> /dev/null
+	fi
+
 	# POLICY CHAIN
 	iptables -N POLICYIN
 	iptables -A INPUT -j POLICYIN


hooks/post-receive
--
IPFire 2.x development tree

^ permalink raw reply	[flat|nested] only message in thread
only message in thread, other threads:[~2024-01-19 16:39 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-19 16:39 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0742747e6dc4416f5a7c7b7feabdcb639a8b5f55 Michael Tremer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox