aboutsummaryrefslogtreecommitdiffstats
path: root/config/varnish64
diff options
context:
space:
mode:
Diffstat (limited to 'config/varnish64')
-rw-r--r--config/varnish64/varnish.inc6
-rwxr-xr-xconfig/varnish64/varnish.widget.php2
-rw-r--r--config/varnish64/varnish_backends.xml18
-rw-r--r--config/varnish64/varnish_lb_directors.xml8
-rw-r--r--config/varnish64/varnish_settings.xml2
-rw-r--r--config/varnish64/varnish_view_config.php6
-rw-r--r--config/varnish64/varnishstat.php6
7 files changed, 24 insertions, 24 deletions
diff --git a/config/varnish64/varnish.inc b/config/varnish64/varnish.inc
index ec7ef0c4..88ad32fa 100644
--- a/config/varnish64/varnish.inc
+++ b/config/varnish64/varnish.inc
@@ -33,7 +33,7 @@
*/
/* ========================================================================== */
-function varnish_settings_post_validate($post, $input_errors) {
+function varnish_settings_post_validate($post, &$input_errors) {
if($post['storagesize'] && !is_numeric($post['storagesize']))
$input_errors[] = "A valid number is required for the field 'Storage size'";
if($post['listeningport'] && !is_numeric($post['listeningport']))
@@ -56,7 +56,7 @@ function varnish_settings_post_validate($post, $input_errors) {
}
-function varnish_lb_directors_post_validate($post, $input_errors) {
+function varnish_lb_directors_post_validate($post, &$input_errors) {
if (preg_match("/[^a-zA-Z0-9]/", $post['directorname']))
$input_errors[] = "The directorname name must only contain the characters a-Z or 0-9";
if(stristr($post['directorurl'], 'http'))
@@ -65,7 +65,7 @@ function varnish_lb_directors_post_validate($post, $input_errors) {
$input_errors[] = "A valid number with a time reference is required for the field 'Req grace'";
}
-function varnish_backends_post_validate($post, $input_errors) {
+function varnish_backends_post_validate($post, &$input_errors) {
if (!$post['backendname'] || preg_match("/[^a-zA-Z0-9]/", $post['backendname']))
$input_errors[] = "The backend name must only contain the characters a-Z or 0-9";
if(!is_ipaddr($post['ipaddress']))
diff --git a/config/varnish64/varnish.widget.php b/config/varnish64/varnish.widget.php
index 35980db5..35723e95 100755
--- a/config/varnish64/varnish.widget.php
+++ b/config/varnish64/varnish.widget.php
@@ -2,7 +2,7 @@
/*
Copyright 2011 Thomas Schaefer - Tomschaefer.org
Copyright 2011 Marcello Coutinho
- Part of pfSense widgets (www.pfsense.com)
+ Part of pfSense widgets (www.pfsense.org)
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
diff --git a/config/varnish64/varnish_backends.xml b/config/varnish64/varnish_backends.xml
index d6aaa261..1684727c 100644
--- a/config/varnish64/varnish_backends.xml
+++ b/config/varnish64/varnish_backends.xml
@@ -48,42 +48,42 @@
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/varnish64/varnish_lb_directors.xml</item>
+ <item>https://packages.pfsense.org/packages/config/varnish64/varnish_lb_directors.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/varnish64/varnish_settings.xml</item>
+ <item>https://packages.pfsense.org/packages/config/varnish64/varnish_settings.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/varnish64/varnish_custom_vcl.xml</item>
+ <item>https://packages.pfsense.org/packages/config/varnish64/varnish_custom_vcl.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/www/widgets/widgets/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/varnish64/varnish.widget.php</item>
+ <item>https://packages.pfsense.org/packages/config/varnish64/varnish.widget.php</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/varnish64/varnish.inc</item>
+ <item>https://packages.pfsense.org/packages/config/varnish64/varnish.inc</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/varnish64/varnish_sync.xml</item>
+ <item>https://packages.pfsense.org/packages/config/varnish64/varnish_sync.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/www/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/varnish64/varnish_view_config.php</item>
+ <item>https://packages.pfsense.org/packages/config/varnish64/varnish_view_config.php</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/www/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/varnish64/varnishstat.php</item>
+ <item>https://packages.pfsense.org/packages/config/varnish64/varnishstat.php</item>
</additional_files_needed>
<menu>
<name>Varnish</name>
@@ -281,6 +281,6 @@
varnish_start();
</custom_php_resync_config_command>
<custom_php_validation_command>
- varnish_backends_post_validate($_POST, &amp;$input_errors);
+ varnish_backends_post_validate($_POST, $input_errors);
</custom_php_validation_command>
</packagegui>
diff --git a/config/varnish64/varnish_lb_directors.xml b/config/varnish64/varnish_lb_directors.xml
index 4c46414e..f61d66cb 100644
--- a/config/varnish64/varnish_lb_directors.xml
+++ b/config/varnish64/varnish_lb_directors.xml
@@ -49,17 +49,17 @@
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/varnish64/varnish_settings.xml</item>
+ <item>https://packages.pfsense.org/packages/config/varnish64/varnish_settings.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/varnish64/varnish_custom_vcl.xml</item>
+ <item>https://packages.pfsense.org/packages/config/varnish64/varnish_custom_vcl.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/varnish64/varnish.inc</item>
+ <item>https://packages.pfsense.org/packages/config/varnish64/varnish.inc</item>
</additional_files_needed>
<menu>
<name>Varnish </name>
@@ -275,6 +275,6 @@
varnish_start();
</custom_php_resync_config_command>
<custom_php_validation_command>
- varnish_lb_directors_post_validate($_POST, &amp;$input_errors);
+ varnish_lb_directors_post_validate($_POST, $input_errors);
</custom_php_validation_command>
</packagegui> \ No newline at end of file
diff --git a/config/varnish64/varnish_settings.xml b/config/varnish64/varnish_settings.xml
index 0576caad..f5a8bdcd 100644
--- a/config/varnish64/varnish_settings.xml
+++ b/config/varnish64/varnish_settings.xml
@@ -279,6 +279,6 @@
varnish_start();
</custom_php_resync_config_command>
<custom_php_validation_command>
- varnish_settings_post_validate($_POST, &amp;$input_errors);
+ varnish_settings_post_validate($_POST, $input_errors);
</custom_php_validation_command>
</packagegui> \ No newline at end of file
diff --git a/config/varnish64/varnish_view_config.php b/config/varnish64/varnish_view_config.php
index 2e449b51..69a9fabb 100644
--- a/config/varnish64/varnish_view_config.php
+++ b/config/varnish64/varnish_view_config.php
@@ -1,7 +1,7 @@
<?php
/*
varnish_view_config.php
- part of pfSense (http://www.pfsense.com/)
+ part of pfSense (https://www.pfsense.org/)
Copyright (C) 2010 Scott Ullrich <sullrich@gmail.com>
All rights reserved.
@@ -29,8 +29,8 @@
require("guiconfig.inc");
-$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
-if(strstr($pfSversion, "1.2"))
+$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+if ($pf_version < 2.0)
$one_two = true;
$pgtitle = "Varnish: View Configuration";
diff --git a/config/varnish64/varnishstat.php b/config/varnish64/varnishstat.php
index 6374525a..10d9ceb9 100644
--- a/config/varnish64/varnishstat.php
+++ b/config/varnish64/varnishstat.php
@@ -1,7 +1,7 @@
<?php
/*
varnishstat_view_logs.php
- part of pfSense (http://www.pfsense.com/)
+ part of pfSense (https://www.pfsense.org/)
Copyright (C) 2006 Scott Ullrich <sullrich@gmail.com>
All rights reserved.
@@ -36,8 +36,8 @@ if($_REQUEST['getactivity']) {
exit;
}
-$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
-if(strstr($pfSversion, "1.2"))
+$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+if ($pf_version < 2.0)
$one_two = true;
$pgtitle = "Varnish: VarnishSTAT";
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-29 16:37:09 +0000