-
diff --git a/config/proxy/errors.ipfire/de/ERR_FTP_PUT_MODIFIED b/config/proxy/errors.ipfire/de/ERR_FTP_PUT_MODIFIED
deleted file mode 100644
index 26aa7ff23..000000000
--- a/config/proxy/errors.ipfire/de/ERR_FTP_PUT_MODIFIED
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-FTP PUT erfolgreich: Datei aktualisiert
-
-
-
-
-Datei aktualisiert
-
-
-
- |
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/de/ERR_FTP_UNAVAILABLE b/config/proxy/errors.ipfire/de/ERR_FTP_UNAVAILABLE
deleted file mode 100644
index 3413832d1..000000000
--- a/config/proxy/errors.ipfire/de/ERR_FTP_UNAVAILABLE
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-FEHLER: Die angeforderte URL konnte nicht geholt werden
-
-
-
-Sorry ... Die angeforderte URL konnte nicht geholt werden
-
-
-
- |
-
-
-
-
-
-Der FTP Server war zu beschäftigt während des Versuches, den URL
-%U
-zu laden.
-
-Squid sendete den folgenden FTP-Befehl:
- %f
-und erhielt die Antwort:
-%F
-%g
-
-
-
-Ihr Cache Administrator ist %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/de/ERR_ICAP_FAILURE b/config/proxy/errors.ipfire/de/ERR_ICAP_FAILURE
deleted file mode 100644
index ed9246f04..000000000
--- a/config/proxy/errors.ipfire/de/ERR_ICAP_FAILURE
+++ /dev/null
@@ -1 +0,0 @@
- FEHLER: Die angeforderte URL konnte nicht gefunden werden
ERROR
The requested URL could not be retrieved
Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:
ICAP Protokoll Fehler.
Das System antwortete: %E
Das heißt, dass etwas mit der ICAP Kommunikation nicht stimmt.
Mögliche Probleme sind:
\ No newline at end of file
diff --git a/config/proxy/errors.ipfire/de/ERR_INVALID_REQ b/config/proxy/errors.ipfire/de/ERR_INVALID_REQ
deleted file mode 100644
index e6a72a45e..000000000
--- a/config/proxy/errors.ipfire/de/ERR_INVALID_REQ
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-FEHLER: Die angeforderte URL konnte nicht geholt werden
-
-
-
-
-Sorry ... Die angeforderte URL konnte nicht geholt werden
-
-
-
- |
-
-
-
-
-
-Während des Versuches, die Anfrage
-
-%R
-
-zu verarbeiten, trat der folgende Fehler auf:
-
-
-
-Ein Teil der HTTP-Anfrage ist ungültig. Mögliche Gründe:
-
-- Fehlende oder unbekannte Anfrage-Methode (GET, POST)
-
- Fehlender URL
-
- Fehlender HTTP Identifier (HTTP/1.0)
-
- Anfrage ist zu groß
-
- Content-Length fehlt für POST- oder PUT-Anfragen
-
- Ungültige Zeichen im Hostnamen - z.B. Unterstriche ('_'),
- Umlaute und Kommata sind nicht erlaubt.
-
-
-
-
-Ihr Cache Administrator ist %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/de/ERR_INVALID_RESP b/config/proxy/errors.ipfire/de/ERR_INVALID_RESP
deleted file mode 100644
index e695c41e8..000000000
--- a/config/proxy/errors.ipfire/de/ERR_INVALID_RESP
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-FEHLER: Die angeforderte URL konnte nicht geholt werden
-
-
-
-
-Sorry ... Die angeforderte URL konnte nicht geholt werden
-
-
-
- |
-
-
-
-
-
-Während des Versuches, die Anfrage
-
-%R
-
-
-zu verarbeiten, trat der folgende Fehler auf:
-
--
-
-Ungültige Antwort
-
-
-
-
-Die HTTP Antwortmeldung des kontaktierten Servers konnte nicht verstanden werden
-oder war auf andere Weise missgebildet. Bitte kontaktieren Sie den Betreiber der
-betreffenden Webseite. Wenn nötig kann Ihr Cache Administrator in der Lage sein,
-Sie mit mehr Details über die genaue Ursache des Problems zu versorgen.
-
- Ihr Cache Administrator ist %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/de/ERR_INVALID_URL b/config/proxy/errors.ipfire/de/ERR_INVALID_URL
deleted file mode 100644
index fdf23f944..000000000
--- a/config/proxy/errors.ipfire/de/ERR_INVALID_URL
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-FEHLER: Die angeforderte URL konnte nicht geholt werden
-
-
-
-
-Sorry ... Die angeforderte URL konnte nicht geholt werden
-
-
-
- |
-
-
-
-
-
-Während des Versuches, den URL
-%U
-zu laden, trat der folgende Fehler auf:
-
-
-
-Ein Teil des angefragten URL ist ungültig. Mögliche Gründe:
-
-- Fehlendes oder unkorrektes Zugriffsprotokoll (sollte 'http://' oder ähnlich sein)
-
- Fehlender Hostname
-
- Ungültiges 'double-escape' im URL-Pfad
-
- Ungültige Zeichen im Hostnamen - z.B. Unterstriche ('_'),
- Umlaute und Kommata sind nicht erlaubt.
-
-
-
-
-Ihr Cache Administrator ist %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/de/ERR_LIFETIME_EXP b/config/proxy/errors.ipfire/de/ERR_LIFETIME_EXP
deleted file mode 100644
index ca9750857..000000000
--- a/config/proxy/errors.ipfire/de/ERR_LIFETIME_EXP
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-FEHLER: Die angeforderte URL konnte nicht geholt werden
-
-
-
-
-Sorry ... Die angeforderte URL konnte nicht geholt werden
-
-
-
- |
-
-
-
-
-
-Während des Versuches, den URL
-%U
-zu laden, trat der folgende Fehler auf:
-
--
-Verbindungs-Lebensdauer ist abgelaufen
-
-
-
-Squid hat die Anfrage abgebrochen, weil sie die maximale
-Verbindungs-Lebensdauer überschritten hat.
-
-
-
-Ihr Cache Administrator ist %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/de/ERR_NO_RELAY b/config/proxy/errors.ipfire/de/ERR_NO_RELAY
deleted file mode 100644
index 46bc51efb..000000000
--- a/config/proxy/errors.ipfire/de/ERR_NO_RELAY
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-FEHLER: Die angeforderte URL konnte nicht geholt werden
-
-
-
-
-Sorry ... Die angeforderte URL konnte nicht geholt werden
-
-
-
- |
-
-
-
-
-
-Während des Versuches, den URL
-%U
-zu laden, trat der folgende Fehler auf:
-
-
-
-Es sind keine WAIS-Relay-Rechner für diesen Cache definiert.
-Teilen Sie dies Ihrem Cache Administrator mit.
-
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/de/ERR_ONLY_IF_CACHED_MISS b/config/proxy/errors.ipfire/de/ERR_ONLY_IF_CACHED_MISS
deleted file mode 100644
index e77d17bff..000000000
--- a/config/proxy/errors.ipfire/de/ERR_ONLY_IF_CACHED_MISS
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-FEHLER: Die angeforderte URL konnte nicht geholt werden
-
-
-
-
-Sorry ... Die angeforderte URL konnte nicht geholt werden
-
-
-
- |
-
-
-
-
-
-Während des Versuches, den URL
-%U
-zu laden, trat der folgende Fehler auf:
-
--
-Ein gültiges Dokument wurde nicht im Cache gefunden, und die '
only-if-cached directive' war angegeben.
-
-
-
-
-Sie haben eine Anfrage mit einer only-if-cached
-Cache-Control-Direktive abgeschickt. Das Dokument wurde nicht im Cache gefunden,
-oder es hätte eine Überprüfung benötigt,
-die durch die only-if-cached dicective verboten wurde.
-
-
-
-Ihr Cache Administrator ist %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/de/ERR_READ_ERROR b/config/proxy/errors.ipfire/de/ERR_READ_ERROR
deleted file mode 100644
index c4f8a7871..000000000
--- a/config/proxy/errors.ipfire/de/ERR_READ_ERROR
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-FEHLER: Die angeforderte URL konnte nicht geholt werden
-
-
-
-
-Sorry ... Die angeforderte URL konnte nicht geholt werden
-
-
-
- |
-
-
-
-
-
-Während des Versuches, den URL
-%U
-zu laden, trat der folgende Fehler auf:
-
-
-
-Das System gab:
- %E
-zurück.
-
-Bei dem Versuch, Daten vom Netzwerk zu lesen, trat ein Fehler
-auf. Bitte versuchen Sie Ihre Anfrage erneut.
-
-
-
-Ihr Cache Administrator ist %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/de/ERR_READ_TIMEOUT b/config/proxy/errors.ipfire/de/ERR_READ_TIMEOUT
deleted file mode 100644
index 04c72bfa2..000000000
--- a/config/proxy/errors.ipfire/de/ERR_READ_TIMEOUT
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-FEHLER: Die angeforderte URL konnte nicht geholt werden
-
-
-
-
-Sorry ... Die angeforderte URL konnte nicht geholt werden
-
-
-
- |
-
-
-
-
-
-Während des Versuches, den URL
-%U
-zu laden, trat der folgende Fehler auf:
-
-
-
-Das System gab:
- %E
-zurück.
-
-Bei dem Versuch Daten vom Netzwerk zu lesen, mußte zu lange
-gewartet werden (timeout).
-Das Netzwerk oder der Server könnten deaktiviert oder
-überlastet sein. Bitte versuchen Sie Ihre Anfrage erneut.
-
-
-
-Ihr Cache Administrator ist %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/de/ERR_SECURE_CONNECT_FAIL b/config/proxy/errors.ipfire/de/ERR_SECURE_CONNECT_FAIL
deleted file mode 100644
index 4f4238302..000000000
--- a/config/proxy/errors.ipfire/de/ERR_SECURE_CONNECT_FAIL
+++ /dev/null
@@ -1 +0,0 @@
- FEHLER: Die angeforderte URL konnte nicht gefunden werden
ERROR
The requested URL could not be retrieved
Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:
Konnte keine sichere Verbindung zu %I herstellen
Das System antwortete: %E
Dieser Proxy und der Zielhost waren nicht in der Lage Sicherheitseinstellungen auszuhandeln die beidseitig akzeptiert werden. Es ist möglich dass der Zielhost keine sicheren Verbindungen unterstützte oder der Proxy nicht mit dem Sicherheitszertifikat des Hosts einverstanden ist.
Ihr Cache Administrator ist %w.
\ No newline at end of file
diff --git a/config/proxy/errors.ipfire/de/ERR_SHUTTING_DOWN b/config/proxy/errors.ipfire/de/ERR_SHUTTING_DOWN
deleted file mode 100644
index 66b001e31..000000000
--- a/config/proxy/errors.ipfire/de/ERR_SHUTTING_DOWN
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-FEHLER: Die angeforderte URL konnte nicht geholt werden
-
-
-
-
-Sorry ... Die angeforderte URL konnte nicht geholt werden
-
-
-
- |
-
-
-
-
-
-Während des Versuches, den URL
-%U
-zu laden, trat folgendes Problem auf:
-
-
-- Dieser Cache ist im Begriff herunterzufahren und kann Ihre Anfrage
-zur Zeit nicht bearbeiten. Bitte wiederholen Sie Ihre Anfrage etwas später.
-
-
-
-Ihr Cache Administrator ist %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/de/ERR_SOCKET_FAILURE b/config/proxy/errors.ipfire/de/ERR_SOCKET_FAILURE
deleted file mode 100644
index 27241e251..000000000
--- a/config/proxy/errors.ipfire/de/ERR_SOCKET_FAILURE
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-FEHLER: Die angeforderte URL konnte nicht geholt werden
-
-
-
-
-Sorry ... Die angeforderte URL konnte nicht geholt werden
-
-
-
- |
-
-
-
-
-
-Während des Versuches, den URL
-%U
-zu laden, trat der folgende Fehler auf:
-
-
-
-Das System gab:
- %E
-zurück.
-
-Squid ist nicht in der Lage, einen TCP-Socket zu öffnen,
-wahrscheinlich wegen extremer Überlastung.
-Bitte versuchen Sie Ihre Anfrage erneut.
-
-
-
-Ihr Cache Administrator ist %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/de/ERR_TOO_BIG b/config/proxy/errors.ipfire/de/ERR_TOO_BIG
deleted file mode 100644
index 445c08698..000000000
--- a/config/proxy/errors.ipfire/de/ERR_TOO_BIG
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-FEHLER: Die angeforderte URL konnte nicht geholt werden
-
-
-
-
-Sorry ... Die angeforderte URL konnte nicht geholt werden
-
-
-
- |
-
-
-
-
-
-Während des Versuches, den URL
-%U
-zu laden, trat folgendes Problem auf:
-
--
-
-Die Anfrage oder die Antwort ist zu groß.
-
-
-
-
-Wenn Sie eine POST oder PUT Anfrage gemacht haben, dann ist der 'request body'
-(das was Sie versucht haben hochzuladen) zu groß. Wenn Sie eine GET
-Anfrage gemacht haben, dann ist der 'reply body' (das was Sie versuchen
-herunterzuladen) zu groß. Diese Beschränkungen wurden von Ihrem
-Internet Service Provider, der diesen Cache Server unterhält, festgelegt.
-Bitte setzen Sie sich direkt mit ihm in Kontakt wenn Sie meinen, daß
-dies ein Fehler ist.
-
-
-Ihr Cache Administrator ist %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/de/ERR_UNSUP_HTTPVERSION b/config/proxy/errors.ipfire/de/ERR_UNSUP_HTTPVERSION
deleted file mode 100644
index 4cc1cdade..000000000
--- a/config/proxy/errors.ipfire/de/ERR_UNSUP_HTTPVERSION
+++ /dev/null
@@ -1 +0,0 @@
- FEHLER: Die angeforderte URL konnte nicht gefunden werden
ERROR
Nicht unterstützte HTTP Version
Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:
Unsupported HTTP version
Dieser Squid akzeptiert die angeforderte HTTP Version nicht.
Ihr Cache Administrator ist %w.
\ No newline at end of file
diff --git a/config/proxy/errors.ipfire/de/ERR_UNSUP_REQ b/config/proxy/errors.ipfire/de/ERR_UNSUP_REQ
deleted file mode 100644
index 6abfd3fb9..000000000
--- a/config/proxy/errors.ipfire/de/ERR_UNSUP_REQ
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-FEHLER: Die angeforderte URL konnte nicht geholt werden
-
-
-
-
-Sorry ... Die angeforderte URL konnte nicht geholt werden
-
-
-
- |
-
-
-
-
-
-Während des Versuches, den URL
-%U
-zu laden, trat der folgende Fehler auf:
-
--
-Nicht unterstützte Zugriffsmethode oder nicht unterstütztes Protokoll
-
-
-
-Squid unterstützt nicht alle Anfragemethoden für alle
-Zugriffsprotokolle.
-Beispielsweise können Sie keine Gopher-Anfrage POST'en.
-
-
-
-Ihr Cache Administrator ist %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/de/ERR_URN_RESOLVE b/config/proxy/errors.ipfire/de/ERR_URN_RESOLVE
deleted file mode 100644
index bed94e369..000000000
--- a/config/proxy/errors.ipfire/de/ERR_URN_RESOLVE
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-FEHLER: Die angeforderete URN konnte nicht geholt werden
-
-
-
-
-Sorry ... Ein URL für den angeforderten URN konnte nicht geholt werden
-
-
-
- |
-
-
-
-
-
-Während des Versuches, den URN
-%U
-zu laden, trat der folgende Fehler auf:
-
--
-Die URN konnte nicht aufgelöst werden
-
-
-
-Erwarten Sie nicht zu viel von URNs auf %T
-
-
-
-Ihr Cache Administrator ist %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/de/ERR_WRITE_ERROR b/config/proxy/errors.ipfire/de/ERR_WRITE_ERROR
deleted file mode 100644
index 0d29f2210..000000000
--- a/config/proxy/errors.ipfire/de/ERR_WRITE_ERROR
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-FEHLER: Die angeforderte URL konnte nicht geholt werden
-
-
-
-
-Sorry ... Die angeforderte URL konnte nicht geholt werden
-
-
-
- |
-
-
-
-
-
-Während des Versuches, den URL
-%U
-zu laden, trat der folgende Fehler auf:
-
-
-
-Das System gab:
- %E
-zurück.
-
-Ein Fehler trat während des Schreibens zum Netzwerk auf.
-Bitte wiederholen Sie Ihre Anfrage.
-
-
-
-Ihr Cache Administrator ist %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/de/ERR_ZERO_SIZE_OBJECT b/config/proxy/errors.ipfire/de/ERR_ZERO_SIZE_OBJECT
deleted file mode 100644
index be1a83095..000000000
--- a/config/proxy/errors.ipfire/de/ERR_ZERO_SIZE_OBJECT
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-FEHLER: Die angeforderte URL konnte nicht geholt werden
-
-
-
-
-Sorry ... Die angeforderte URL konnte nicht geholt werden
-
-
-
- |
-
-
-
-
-
-Während des Versuches, den URL
-%U
-zu laden, trat der folgende Fehler auf:
-
-
-
-Squid hat keinerlei Daten auf diese Anfrage empfangen.
-
-
-
-Ihr Cache Administrator ist %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_ACCESS_DENIED b/config/proxy/errors.ipfire/en/ERR_ACCESS_DENIED
deleted file mode 100644
index 45b686b3e..000000000
--- a/config/proxy/errors.ipfire/en/ERR_ACCESS_DENIED
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
-Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_CACHE_ACCESS_DENIED b/config/proxy/errors.ipfire/en/ERR_CACHE_ACCESS_DENIED
deleted file mode 100644
index beccfe332..000000000
--- a/config/proxy/errors.ipfire/en/ERR_CACHE_ACCESS_DENIED
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-ERROR: Cache Access Denied
-
-
-
-
-Sorry ... Cache Access Denied
-
-
-
- |
-
-
-
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-Cache Access Denied.
-
-
-
-
-Sorry, you are not currently allowed to request:
- %U
-from this cache until you have authenticated yourself.
-
-
-
-You need to use Netscape version 2.0 or greater, or Microsoft Internet
-Explorer 3.0, or an HTTP/1.1 compliant browser for this to work. Please
-contact the cache administrator if you have
-difficulties authenticating yourself or
-change your default password.
-
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_CACHE_MGR_ACCESS_DENIED b/config/proxy/errors.ipfire/en/ERR_CACHE_MGR_ACCESS_DENIED
deleted file mode 100644
index b8beae084..000000000
--- a/config/proxy/errors.ipfire/en/ERR_CACHE_MGR_ACCESS_DENIED
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-ERROR: Cache Manager Access Denied
-
-
-
-
-Sorry ... Cache Manager Access Denied
-
-
-
- |
-
-
-
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-Cache Manager Access Denied.
-
-
-
-
-Sorry, you are not currently allowed to request:
- %U
-from this cache manager until you have authenticated yourself.
-
-
- You need to use Netscape version 2.0 or greater, or Microsoft Internet
-Explorer 3.0, or an HTTP/1.1 compliant browser for this to work. Please
-contact the cache administrator if you have
-difficulties authenticating yourself or, if you are the
-administrator, read Squid documentation on cache manager interface and check
-cache log for more detailed error messages.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_CANNOT_FORWARD b/config/proxy/errors.ipfire/en/ERR_CANNOT_FORWARD
deleted file mode 100644
index 6356a7cad..000000000
--- a/config/proxy/errors.ipfire/en/ERR_CANNOT_FORWARD
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-Unable to forward this request at this time.
-
-
-
-
-This request could not be forwarded to the origin server or to any
-parent caches. The most likely cause for this error is that:
-
-- The cache administrator does not allow this cache to make
- direct connections to origin servers, and
-
- All configured parent caches are currently unreachable.
-
-Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_CONNECT_FAIL b/config/proxy/errors.ipfire/en/ERR_CONNECT_FAIL
deleted file mode 100644
index 40af3e5e7..000000000
--- a/config/proxy/errors.ipfire/en/ERR_CONNECT_FAIL
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-Connection to %I Failed
-
-
-
-
-The system returned:
- %E
-
-
-The remote host or network may be down. Please try the request again.
- Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_DIR_LISTING b/config/proxy/errors.ipfire/en/ERR_DIR_LISTING
deleted file mode 100644
index d7f0f38f1..000000000
--- a/config/proxy/errors.ipfire/en/ERR_DIR_LISTING
+++ /dev/null
@@ -1 +0,0 @@
- Directory: %U
\ No newline at end of file
diff --git a/config/proxy/errors.ipfire/en/ERR_DNS_FAIL b/config/proxy/errors.ipfire/en/ERR_DNS_FAIL
deleted file mode 100644
index 99cd5198f..000000000
--- a/config/proxy/errors.ipfire/en/ERR_DNS_FAIL
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
-Unable to determine IP address from host name for
-%H
-
-
-
-The dnsserver returned:
-
-%z
-
-
-
-This means that:
-
- The cache was not able to resolve the hostname presented in the URL.
- Check if the address is correct.
-
-Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_ESI b/config/proxy/errors.ipfire/en/ERR_ESI
deleted file mode 100644
index 21b380346..000000000
--- a/config/proxy/errors.ipfire/en/ERR_ESI
+++ /dev/null
@@ -1 +0,0 @@
- ERROR: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ESI Processing failed.
The ESI processor returned:
%Z
This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.
Your webmaster is %w.
\ No newline at end of file
diff --git a/config/proxy/errors.ipfire/en/ERR_FORWARDING_DENIED b/config/proxy/errors.ipfire/en/ERR_FORWARDING_DENIED
deleted file mode 100644
index cd2aedcf8..000000000
--- a/config/proxy/errors.ipfire/en/ERR_FORWARDING_DENIED
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-Forwarding Denied.
-
-
-
-
-This cache will not forward your request because it is trying to enforce a
-sibling relationship. Perhaps the client at %i is a cache which has been
-misconfigured.
- Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_FTP_DISABLED b/config/proxy/errors.ipfire/en/ERR_FTP_DISABLED
deleted file mode 100644
index 4823ba940..000000000
--- a/config/proxy/errors.ipfire/en/ERR_FTP_DISABLED
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
-
-
-This cache does not support FTP.
- Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_FTP_FAILURE b/config/proxy/errors.ipfire/en/ERR_FTP_FAILURE
deleted file mode 100644
index 9e20f44e0..000000000
--- a/config/proxy/errors.ipfire/en/ERR_FTP_FAILURE
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-An FTP protocol error occurred
-while trying to retrieve the URL:
-%U
-
-Squid sent the following FTP command:
- %f
-and then received this reply
-%F
-%g
-Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_FTP_FORBIDDEN b/config/proxy/errors.ipfire/en/ERR_FTP_FORBIDDEN
deleted file mode 100644
index 6eea8d8fc..000000000
--- a/config/proxy/errors.ipfire/en/ERR_FTP_FORBIDDEN
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-An FTP authentication failure occurred
-while trying to retrieve the URL:
-%U
-
-Squid sent the following FTP command:
- %f
-and then received this reply
-%F
-%g
-Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_FTP_NOT_FOUND b/config/proxy/errors.ipfire/en/ERR_FTP_NOT_FOUND
deleted file mode 100644
index ead0b2a9a..000000000
--- a/config/proxy/errors.ipfire/en/ERR_FTP_NOT_FOUND
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-The following URL could not be retrieved:
-%U
-
-Squid sent the following FTP command:
- %f
-and then received this reply
-%F
-%g
-
-This might be caused by an FTP URL with an absolute path (which does
-not comply with RFC 1738). If this is the cause, then the file
-can be found at %B.
- Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_FTP_PUT_CREATED b/config/proxy/errors.ipfire/en/ERR_FTP_PUT_CREATED
deleted file mode 100644
index 3c9c29613..000000000
--- a/config/proxy/errors.ipfire/en/ERR_FTP_PUT_CREATED
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-FTP PUT Successful: File Created
-
-
-
-
-File created
-
-
-
- |
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_FTP_PUT_ERROR b/config/proxy/errors.ipfire/en/ERR_FTP_PUT_ERROR
deleted file mode 100644
index b501c133e..000000000
--- a/config/proxy/errors.ipfire/en/ERR_FTP_PUT_ERROR
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-ERROR: FTP upload failed
-
-
-
-
-Sorry ... FTP PUT/upload failed
-
-
-
- |
-
-
-
-
-
-While trying to PUT the following URL:
-%U
-
-Squid sent the following FTP command:
-
- %f
-
-and then received this reply
-
- %F
-
-
-This means that:
-
-Check path, permissions, diskspace and try again.
-
-Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_FTP_PUT_MODIFIED b/config/proxy/errors.ipfire/en/ERR_FTP_PUT_MODIFIED
deleted file mode 100644
index 14b36ff1b..000000000
--- a/config/proxy/errors.ipfire/en/ERR_FTP_PUT_MODIFIED
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-FTP PUT Successful: File updated
-
-
-
-
-File updated
-
-
-
- |
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_FTP_UNAVAILABLE b/config/proxy/errors.ipfire/en/ERR_FTP_UNAVAILABLE
deleted file mode 100644
index 5aadaf56a..000000000
--- a/config/proxy/errors.ipfire/en/ERR_FTP_UNAVAILABLE
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-Squid sent the following FTP command:
- %f
-and then received this reply
-%F
-%g
-Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_ICAP_FAILURE b/config/proxy/errors.ipfire/en/ERR_ICAP_FAILURE
deleted file mode 100644
index a9066ca81..000000000
--- a/config/proxy/errors.ipfire/en/ERR_ICAP_FAILURE
+++ /dev/null
@@ -1 +0,0 @@
- ERROR: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ICAP protocol error.
The system returned: %E
This means that some aspect of the ICAP communication failed.
Some possible problems are:
\ No newline at end of file
diff --git a/config/proxy/errors.ipfire/en/ERR_INVALID_REQ b/config/proxy/errors.ipfire/en/ERR_INVALID_REQ
deleted file mode 100644
index 24930c697..000000000
--- a/config/proxy/errors.ipfire/en/ERR_INVALID_REQ
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-While trying to process the request:
-
-%R
-
-
-The following error was encountered:
-
-
-
-Some aspect of the HTTP Request is invalid. Possible problems:
-
-- Missing or unknown request method
-
- Missing URL
-
- Missing HTTP Identifier (HTTP/1.0)
-
- Request is too large
-
- Content-Length missing for POST or PUT requests
-
- Illegal character in hostname; underscores are not allowed
-
-Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_INVALID_RESP b/config/proxy/errors.ipfire/en/ERR_INVALID_RESP
deleted file mode 100644
index ed87a0ca8..000000000
--- a/config/proxy/errors.ipfire/en/ERR_INVALID_RESP
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-While trying to process the request:
-
-%R
-
-
-The following error was encountered:
-
--
-
-Invalid Response
-
-
-
-
-The HTTP Response message received from the contacted server
-could not be understood or was otherwise malformed. Please contact
-the site operator. Your cache administrator may be able to provide
-you with more details about the exact nature of the problem if needed.
-
- Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_INVALID_URL b/config/proxy/errors.ipfire/en/ERR_INVALID_URL
deleted file mode 100644
index ca445c4fc..000000000
--- a/config/proxy/errors.ipfire/en/ERR_INVALID_URL
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
-
-
-Some aspect of the requested URL is incorrect. Possible problems:
-
-- Missing or incorrect access protocol (should be `http://'' or similar)
-
- Missing hostname
-
- Illegal double-escape in the URL-Path
-
- Illegal character in hostname; underscores are not allowed
-
-Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_LIFETIME_EXP b/config/proxy/errors.ipfire/en/ERR_LIFETIME_EXP
deleted file mode 100644
index 1adadc6fe..000000000
--- a/config/proxy/errors.ipfire/en/ERR_LIFETIME_EXP
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-Connection Lifetime Expired
-
-
-
-
-Squid has terminated the request because it has exceeded the maximum
-connection lifetime.
- Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_NO_RELAY b/config/proxy/errors.ipfire/en/ERR_NO_RELAY
deleted file mode 100644
index 567ec5fee..000000000
--- a/config/proxy/errors.ipfire/en/ERR_NO_RELAY
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
-
-
-There is no WAIS Relay host defined for this Cache! Yell at the administrator.
- Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_ONLY_IF_CACHED_MISS b/config/proxy/errors.ipfire/en/ERR_ONLY_IF_CACHED_MISS
deleted file mode 100644
index 592e1750b..000000000
--- a/config/proxy/errors.ipfire/en/ERR_ONLY_IF_CACHED_MISS
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-Valid document was not found in the cache and
only-if-cached
-directive was specified.
-
-
-
-
-
-You have issued a request with a only-if-cached cache control
-directive. The document was not found in the cache, or it required
-revalidation prohibited by only-if-cached directive.
-
- Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_READ_ERROR b/config/proxy/errors.ipfire/en/ERR_READ_ERROR
deleted file mode 100644
index 41541b825..000000000
--- a/config/proxy/errors.ipfire/en/ERR_READ_ERROR
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
-
-
-The system returned:
- %E
-
-
-An error condition occurred while reading data from the network. Please
-retry your request.
- Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_READ_TIMEOUT b/config/proxy/errors.ipfire/en/ERR_READ_TIMEOUT
deleted file mode 100644
index 8dc25455b..000000000
--- a/config/proxy/errors.ipfire/en/ERR_READ_TIMEOUT
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
-
-
-The system returned:
- %E
-
-
-A Timeout occurred while waiting to read data from the network. The network
-or server may be down or congested. Please retry your request.
- Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_SECURE_CONNECT_FAIL b/config/proxy/errors.ipfire/en/ERR_SECURE_CONNECT_FAIL
deleted file mode 100644
index ed24cf6b9..000000000
--- a/config/proxy/errors.ipfire/en/ERR_SECURE_CONNECT_FAIL
+++ /dev/null
@@ -1 +0,0 @@
- ERROR: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Failed to establish a secure connection to %I
The system returned: %E
This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.
Your cache administrator is %w.
\ No newline at end of file
diff --git a/config/proxy/errors.ipfire/en/ERR_SHUTTING_DOWN b/config/proxy/errors.ipfire/en/ERR_SHUTTING_DOWN
deleted file mode 100644
index 63d17b03a..000000000
--- a/config/proxy/errors.ipfire/en/ERR_SHUTTING_DOWN
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
-This cache is in the process of shutting down and can not
-service your request at this time. Please retry your
-request again soon.
- Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_SOCKET_FAILURE b/config/proxy/errors.ipfire/en/ERR_SOCKET_FAILURE
deleted file mode 100644
index e8d309c2d..000000000
--- a/config/proxy/errors.ipfire/en/ERR_SOCKET_FAILURE
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
-
-
-The system returned:
- %E
-
-
-Squid is unable to create a TCP socket, presumably due to excessive load.
-Please retry your request.
- Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_TOO_BIG b/config/proxy/errors.ipfire/en/ERR_TOO_BIG
deleted file mode 100644
index 802fe3e81..000000000
--- a/config/proxy/errors.ipfire/en/ERR_TOO_BIG
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-The request or reply is too large.
-
-
-If you are making a POST or PUT request, then your request body
-(the thing you are trying to upload) is too large. If you are
-making a GET request, then the reply body (what you are trying
-to download) is too large. These limits have been established
-by the Internet Service Provider who operates this cache. Please
-contact them directly if you feel this is an error.
-
-
-Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_UNSUP_HTTPVERSION b/config/proxy/errors.ipfire/en/ERR_UNSUP_HTTPVERSION
deleted file mode 100644
index 4f92bdb25..000000000
--- a/config/proxy/errors.ipfire/en/ERR_UNSUP_HTTPVERSION
+++ /dev/null
@@ -1 +0,0 @@
- ERROR: The requested URL could not be retrieved
ERROR
Unsupported HTTP version
The following error was encountered while trying to retrieve the URL: %U
Unsupported HTTP version
This Squid does not accept the HTTP version you are attempting to use.
Your cache administrator is %w.
\ No newline at end of file
diff --git a/config/proxy/errors.ipfire/en/ERR_UNSUP_REQ b/config/proxy/errors.ipfire/en/ERR_UNSUP_REQ
deleted file mode 100644
index b69569fd4..000000000
--- a/config/proxy/errors.ipfire/en/ERR_UNSUP_REQ
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-Unsupported Request Method and Protocol
-
-
-
-
-Squid does not support all request methods for all access protocols.
-For example, you can not POST a Gopher request.
- Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_URN_RESOLVE b/config/proxy/errors.ipfire/en/ERR_URN_RESOLVE
deleted file mode 100644
index dba21bc58..000000000
--- a/config/proxy/errors.ipfire/en/ERR_URN_RESOLVE
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-ERROR: The requested URN not be retrieved
-
-
-
-
-Sorry ... A URL for the requested URN could not be retrieved
-
-
-
- |
-
-
-
-
-
-While trying to retrieve the URN:
-%U
-
-The following error was encountered:
-
--
-
-Cannot Resolve URN
-
-
-
-
-Hey, don't expect too much from URNs on %T :)
- Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_WRITE_ERROR b/config/proxy/errors.ipfire/en/ERR_WRITE_ERROR
deleted file mode 100644
index 8363e2e24..000000000
--- a/config/proxy/errors.ipfire/en/ERR_WRITE_ERROR
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
-
-
-The system returned:
- %E
-
-
-An error condition occurred while writing to the network. Please retry your
-request.
- Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/proxy/errors.ipfire/en/ERR_ZERO_SIZE_OBJECT b/config/proxy/errors.ipfire/en/ERR_ZERO_SIZE_OBJECT
deleted file mode 100644
index 3b0a3e641..000000000
--- a/config/proxy/errors.ipfire/en/ERR_ZERO_SIZE_OBJECT
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-
-
-Sorry ... The requested URL could not be retrieved
-
-
-
- |
-
-
-
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-Zero Sized Reply
-
-
-
-
-Squid did not receive any data for this request.
- Your cache administrator is %w.
-
-
-
- |
-
-
-
-Generated %T by %h (%s)
-
-
-
-
diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid
index d2c811456..910e12ff7 100644
--- a/config/rootfiles/common/squid
+++ b/config/rootfiles/common/squid
@@ -20,79 +20,6 @@ usr/lib/squid/auth
#usr/lib/squid/cachemgr.cgi
usr/lib/squid/diskd
#usr/lib/squid/errors
-#usr/lib/squid/errors.ipfire
-#usr/lib/squid/errors.ipfire/de
-usr/lib/squid/errors.ipfire/de/ERR_ACCESS_DENIED
-usr/lib/squid/errors.ipfire/de/ERR_CACHE_ACCESS_DENIED
-usr/lib/squid/errors.ipfire/de/ERR_CACHE_MGR_ACCESS_DENIED
-usr/lib/squid/errors.ipfire/de/ERR_CANNOT_FORWARD
-usr/lib/squid/errors.ipfire/de/ERR_CONNECT_FAIL
-usr/lib/squid/errors.ipfire/de/ERR_DIR_LISTING
-usr/lib/squid/errors.ipfire/de/ERR_DNS_FAIL
-usr/lib/squid/errors.ipfire/de/ERR_ESI
-usr/lib/squid/errors.ipfire/de/ERR_FORWARDING_DENIED
-usr/lib/squid/errors.ipfire/de/ERR_FTP_DISABLED
-usr/lib/squid/errors.ipfire/de/ERR_FTP_FAILURE
-usr/lib/squid/errors.ipfire/de/ERR_FTP_FORBIDDEN
-usr/lib/squid/errors.ipfire/de/ERR_FTP_NOT_FOUND
-usr/lib/squid/errors.ipfire/de/ERR_FTP_PUT_CREATED
-usr/lib/squid/errors.ipfire/de/ERR_FTP_PUT_ERROR
-usr/lib/squid/errors.ipfire/de/ERR_FTP_PUT_MODIFIED
-usr/lib/squid/errors.ipfire/de/ERR_FTP_UNAVAILABLE
-usr/lib/squid/errors.ipfire/de/ERR_ICAP_FAILURE
-usr/lib/squid/errors.ipfire/de/ERR_INVALID_REQ
-usr/lib/squid/errors.ipfire/de/ERR_INVALID_RESP
-usr/lib/squid/errors.ipfire/de/ERR_INVALID_URL
-usr/lib/squid/errors.ipfire/de/ERR_LIFETIME_EXP
-usr/lib/squid/errors.ipfire/de/ERR_NO_RELAY
-usr/lib/squid/errors.ipfire/de/ERR_ONLY_IF_CACHED_MISS
-usr/lib/squid/errors.ipfire/de/ERR_READ_ERROR
-usr/lib/squid/errors.ipfire/de/ERR_READ_TIMEOUT
-usr/lib/squid/errors.ipfire/de/ERR_SECURE_CONNECT_FAIL
-usr/lib/squid/errors.ipfire/de/ERR_SHUTTING_DOWN
-usr/lib/squid/errors.ipfire/de/ERR_SOCKET_FAILURE
-usr/lib/squid/errors.ipfire/de/ERR_TOO_BIG
-usr/lib/squid/errors.ipfire/de/ERR_UNSUP_HTTPVERSION
-usr/lib/squid/errors.ipfire/de/ERR_UNSUP_REQ
-usr/lib/squid/errors.ipfire/de/ERR_URN_RESOLVE
-usr/lib/squid/errors.ipfire/de/ERR_WRITE_ERROR
-usr/lib/squid/errors.ipfire/de/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors.ipfire/en
-usr/lib/squid/errors.ipfire/en/ERR_ACCESS_DENIED
-usr/lib/squid/errors.ipfire/en/ERR_CACHE_ACCESS_DENIED
-usr/lib/squid/errors.ipfire/en/ERR_CACHE_MGR_ACCESS_DENIED
-usr/lib/squid/errors.ipfire/en/ERR_CANNOT_FORWARD
-usr/lib/squid/errors.ipfire/en/ERR_CONNECT_FAIL
-usr/lib/squid/errors.ipfire/en/ERR_DIR_LISTING
-usr/lib/squid/errors.ipfire/en/ERR_DNS_FAIL
-usr/lib/squid/errors.ipfire/en/ERR_ESI
-usr/lib/squid/errors.ipfire/en/ERR_FORWARDING_DENIED
-usr/lib/squid/errors.ipfire/en/ERR_FTP_DISABLED
-usr/lib/squid/errors.ipfire/en/ERR_FTP_FAILURE
-usr/lib/squid/errors.ipfire/en/ERR_FTP_FORBIDDEN
-usr/lib/squid/errors.ipfire/en/ERR_FTP_NOT_FOUND
-usr/lib/squid/errors.ipfire/en/ERR_FTP_PUT_CREATED
-usr/lib/squid/errors.ipfire/en/ERR_FTP_PUT_ERROR
-usr/lib/squid/errors.ipfire/en/ERR_FTP_PUT_MODIFIED
-usr/lib/squid/errors.ipfire/en/ERR_FTP_UNAVAILABLE
-usr/lib/squid/errors.ipfire/en/ERR_ICAP_FAILURE
-usr/lib/squid/errors.ipfire/en/ERR_INVALID_REQ
-usr/lib/squid/errors.ipfire/en/ERR_INVALID_RESP
-usr/lib/squid/errors.ipfire/en/ERR_INVALID_URL
-usr/lib/squid/errors.ipfire/en/ERR_LIFETIME_EXP
-usr/lib/squid/errors.ipfire/en/ERR_NO_RELAY
-usr/lib/squid/errors.ipfire/en/ERR_ONLY_IF_CACHED_MISS
-usr/lib/squid/errors.ipfire/en/ERR_READ_ERROR
-usr/lib/squid/errors.ipfire/en/ERR_READ_TIMEOUT
-usr/lib/squid/errors.ipfire/en/ERR_SECURE_CONNECT_FAIL
-usr/lib/squid/errors.ipfire/en/ERR_SHUTTING_DOWN
-usr/lib/squid/errors.ipfire/en/ERR_SOCKET_FAILURE
-usr/lib/squid/errors.ipfire/en/ERR_TOO_BIG
-usr/lib/squid/errors.ipfire/en/ERR_UNSUP_HTTPVERSION
-usr/lib/squid/errors.ipfire/en/ERR_UNSUP_REQ
-usr/lib/squid/errors.ipfire/en/ERR_URN_RESOLVE
-usr/lib/squid/errors.ipfire/en/ERR_WRITE_ERROR
-usr/lib/squid/errors.ipfire/en/ERR_ZERO_SIZE_OBJECT
#usr/lib/squid/errors/COPYRIGHT
#usr/lib/squid/errors/TRANSLATORS
#usr/lib/squid/errors/af
@@ -516,41 +443,41 @@ usr/lib/squid/errors/en/ERR_ZERO_SIZE_OBJECT
#usr/lib/squid/errors/es-sv
#usr/lib/squid/errors/es-uy
#usr/lib/squid/errors/es-ve
-#usr/lib/squid/errors/es/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/es/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/es/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/es/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/es/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/es/ERR_DIR_LISTING
-#usr/lib/squid/errors/es/ERR_DNS_FAIL
-#usr/lib/squid/errors/es/ERR_ESI
-#usr/lib/squid/errors/es/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/es/ERR_FTP_DISABLED
-#usr/lib/squid/errors/es/ERR_FTP_FAILURE
-#usr/lib/squid/errors/es/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/es/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/es/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/es/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/es/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/es/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/es/ERR_ICAP_FAILURE
-#usr/lib/squid/errors/es/ERR_INVALID_REQ
-#usr/lib/squid/errors/es/ERR_INVALID_RESP
-#usr/lib/squid/errors/es/ERR_INVALID_URL
-#usr/lib/squid/errors/es/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/es/ERR_NO_RELAY
-#usr/lib/squid/errors/es/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/es/ERR_READ_ERROR
-#usr/lib/squid/errors/es/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/es/ERR_SECURE_CONNECT_FAIL
-#usr/lib/squid/errors/es/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/es/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/es/ERR_TOO_BIG
-#usr/lib/squid/errors/es/ERR_UNSUP_HTTPVERSION
-#usr/lib/squid/errors/es/ERR_UNSUP_REQ
-#usr/lib/squid/errors/es/ERR_URN_RESOLVE
-#usr/lib/squid/errors/es/ERR_WRITE_ERROR
-#usr/lib/squid/errors/es/ERR_ZERO_SIZE_OBJECT
+usr/lib/squid/errors/es/ERR_ACCESS_DENIED
+usr/lib/squid/errors/es/ERR_CACHE_ACCESS_DENIED
+usr/lib/squid/errors/es/ERR_CACHE_MGR_ACCESS_DENIED
+usr/lib/squid/errors/es/ERR_CANNOT_FORWARD
+usr/lib/squid/errors/es/ERR_CONNECT_FAIL
+usr/lib/squid/errors/es/ERR_DIR_LISTING
+usr/lib/squid/errors/es/ERR_DNS_FAIL
+usr/lib/squid/errors/es/ERR_ESI
+usr/lib/squid/errors/es/ERR_FORWARDING_DENIED
+usr/lib/squid/errors/es/ERR_FTP_DISABLED
+usr/lib/squid/errors/es/ERR_FTP_FAILURE
+usr/lib/squid/errors/es/ERR_FTP_FORBIDDEN
+usr/lib/squid/errors/es/ERR_FTP_NOT_FOUND
+usr/lib/squid/errors/es/ERR_FTP_PUT_CREATED
+usr/lib/squid/errors/es/ERR_FTP_PUT_ERROR
+usr/lib/squid/errors/es/ERR_FTP_PUT_MODIFIED
+usr/lib/squid/errors/es/ERR_FTP_UNAVAILABLE
+usr/lib/squid/errors/es/ERR_ICAP_FAILURE
+usr/lib/squid/errors/es/ERR_INVALID_REQ
+usr/lib/squid/errors/es/ERR_INVALID_RESP
+usr/lib/squid/errors/es/ERR_INVALID_URL
+usr/lib/squid/errors/es/ERR_LIFETIME_EXP
+usr/lib/squid/errors/es/ERR_NO_RELAY
+usr/lib/squid/errors/es/ERR_ONLY_IF_CACHED_MISS
+usr/lib/squid/errors/es/ERR_READ_ERROR
+usr/lib/squid/errors/es/ERR_READ_TIMEOUT
+usr/lib/squid/errors/es/ERR_SECURE_CONNECT_FAIL
+usr/lib/squid/errors/es/ERR_SHUTTING_DOWN
+usr/lib/squid/errors/es/ERR_SOCKET_FAILURE
+usr/lib/squid/errors/es/ERR_TOO_BIG
+usr/lib/squid/errors/es/ERR_UNSUP_HTTPVERSION
+usr/lib/squid/errors/es/ERR_UNSUP_REQ
+usr/lib/squid/errors/es/ERR_URN_RESOLVE
+usr/lib/squid/errors/es/ERR_WRITE_ERROR
+usr/lib/squid/errors/es/ERR_ZERO_SIZE_OBJECT
#usr/lib/squid/errors/et
#usr/lib/squid/errors/et-ee
#usr/lib/squid/errors/et/ERR_ACCESS_DENIED
@@ -670,41 +597,41 @@ usr/lib/squid/errors/en/ERR_ZERO_SIZE_OBJECT
#usr/lib/squid/errors/fr-fr
#usr/lib/squid/errors/fr-lu
#usr/lib/squid/errors/fr-mc
-#usr/lib/squid/errors/fr/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/fr/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/fr/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/fr/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/fr/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/fr/ERR_DIR_LISTING
-#usr/lib/squid/errors/fr/ERR_DNS_FAIL
-#usr/lib/squid/errors/fr/ERR_ESI
-#usr/lib/squid/errors/fr/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/fr/ERR_FTP_DISABLED
-#usr/lib/squid/errors/fr/ERR_FTP_FAILURE
-#usr/lib/squid/errors/fr/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/fr/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/fr/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/fr/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/fr/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/fr/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/fr/ERR_ICAP_FAILURE
-#usr/lib/squid/errors/fr/ERR_INVALID_REQ
-#usr/lib/squid/errors/fr/ERR_INVALID_RESP
-#usr/lib/squid/errors/fr/ERR_INVALID_URL
-#usr/lib/squid/errors/fr/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/fr/ERR_NO_RELAY
-#usr/lib/squid/errors/fr/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/fr/ERR_READ_ERROR
-#usr/lib/squid/errors/fr/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/fr/ERR_SECURE_CONNECT_FAIL
-#usr/lib/squid/errors/fr/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/fr/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/fr/ERR_TOO_BIG
-#usr/lib/squid/errors/fr/ERR_UNSUP_HTTPVERSION
-#usr/lib/squid/errors/fr/ERR_UNSUP_REQ
-#usr/lib/squid/errors/fr/ERR_URN_RESOLVE
-#usr/lib/squid/errors/fr/ERR_WRITE_ERROR
-#usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
+usr/lib/squid/errors/fr/ERR_ACCESS_DENIED
+usr/lib/squid/errors/fr/ERR_CACHE_ACCESS_DENIED
+usr/lib/squid/errors/fr/ERR_CACHE_MGR_ACCESS_DENIED
+usr/lib/squid/errors/fr/ERR_CANNOT_FORWARD
+usr/lib/squid/errors/fr/ERR_CONNECT_FAIL
+usr/lib/squid/errors/fr/ERR_DIR_LISTING
+usr/lib/squid/errors/fr/ERR_DNS_FAIL
+usr/lib/squid/errors/fr/ERR_ESI
+usr/lib/squid/errors/fr/ERR_FORWARDING_DENIED
+usr/lib/squid/errors/fr/ERR_FTP_DISABLED
+usr/lib/squid/errors/fr/ERR_FTP_FAILURE
+usr/lib/squid/errors/fr/ERR_FTP_FORBIDDEN
+usr/lib/squid/errors/fr/ERR_FTP_NOT_FOUND
+usr/lib/squid/errors/fr/ERR_FTP_PUT_CREATED
+usr/lib/squid/errors/fr/ERR_FTP_PUT_ERROR
+usr/lib/squid/errors/fr/ERR_FTP_PUT_MODIFIED
+usr/lib/squid/errors/fr/ERR_FTP_UNAVAILABLE
+usr/lib/squid/errors/fr/ERR_ICAP_FAILURE
+usr/lib/squid/errors/fr/ERR_INVALID_REQ
+usr/lib/squid/errors/fr/ERR_INVALID_RESP
+usr/lib/squid/errors/fr/ERR_INVALID_URL
+usr/lib/squid/errors/fr/ERR_LIFETIME_EXP
+usr/lib/squid/errors/fr/ERR_NO_RELAY
+usr/lib/squid/errors/fr/ERR_ONLY_IF_CACHED_MISS
+usr/lib/squid/errors/fr/ERR_READ_ERROR
+usr/lib/squid/errors/fr/ERR_READ_TIMEOUT
+usr/lib/squid/errors/fr/ERR_SECURE_CONNECT_FAIL
+usr/lib/squid/errors/fr/ERR_SHUTTING_DOWN
+usr/lib/squid/errors/fr/ERR_SOCKET_FAILURE
+usr/lib/squid/errors/fr/ERR_TOO_BIG
+usr/lib/squid/errors/fr/ERR_UNSUP_HTTPVERSION
+usr/lib/squid/errors/fr/ERR_UNSUP_REQ
+usr/lib/squid/errors/fr/ERR_URN_RESOLVE
+usr/lib/squid/errors/fr/ERR_WRITE_ERROR
+usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
#usr/lib/squid/errors/he
#usr/lib/squid/errors/he-il
#usr/lib/squid/errors/he/ERR_ACCESS_DENIED
@@ -1724,6 +1651,8 @@ usr/sbin/updxlrator
#usr/share/man/man8/squid_ldap_group.8
#usr/share/man/man8/squid_session.8
#usr/share/man/man8/squid_unix_group.8
+var/ipfire/proxy/errorpage-ipfire.css
+var/ipfire/proxy/errorpage-squid.css
var/ipfire/updatexlrator/autocheck/cron.daily
var/ipfire/updatexlrator/autocheck/cron.monthly
var/ipfire/updatexlrator/autocheck/cron.weekly
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index e120fc402..2525b6e2f 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2009 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2010 IPFire Team #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -3080,12 +3080,7 @@ END
print FILE "cache_dir aufs /var/log/cache $proxysettings{'CACHE_SIZE'} $proxysettings{'L1_DIRS'} 256\n\n";
}
- if (($proxysettings{'ERR_DESIGN'} eq 'ipfire' ))
- {
- print FILE "error_directory $errordir.ipfire/$proxysettings{'ERR_LANGUAGE'}\n\n";
- } else {
- print FILE "error_directory $errordir/$proxysettings{'ERR_LANGUAGE'}\n\n";
- }
+ print FILE "error_directory $errordir/$proxysettings{'ERR_LANGUAGE'}\n\n";
if ($proxysettings{'OFFLINE_MODE'} eq 'on') { print FILE "offline_mode on\n\n"; }
@@ -3372,8 +3367,7 @@ acl IPFire_no_access_mac arp "$acl_src_noaccess_mac"
END
;
print FILE "deny_info ";
- if ((($proxysettings{'ERR_DESIGN'} eq 'ipfire') && (-e "$errordir.ipfire/$proxysettings{'ERR_LANGUAGE'}/ERR_ACCESS_DISABLED")) ||
- (($proxysettings{'ERR_DESIGN'} eq 'squid') && (-e "$errordir/$proxysettings{'ERR_LANGUAGE'}/ERR_ACCESS_DISABLED")))
+ if (($proxysettings{'ERR_DESIGN'} eq 'squid') && (-e "$errordir/$proxysettings{'ERR_LANGUAGE'}/ERR_ACCESS_DISABLED"))
{
print FILE "ERR_ACCESS_DISABLED";
} else {
@@ -3381,8 +3375,7 @@ END
}
print FILE " IPFire_no_access_ips\n";
print FILE "deny_info ";
- if ((($proxysettings{'ERR_DESIGN'} eq 'ipfire') && (-e "$errordir.ipfire/$proxysettings{'ERR_LANGUAGE'}/ERR_ACCESS_DISABLED")) ||
- (($proxysettings{'ERR_DESIGN'} eq 'squid') && (-e "$errordir/$proxysettings{'ERR_LANGUAGE'}/ERR_ACCESS_DISABLED")))
+ if (($proxysettings{'ERR_DESIGN'} eq 'squid') && (-e "$errordir/$proxysettings{'ERR_LANGUAGE'}/ERR_ACCESS_DISABLED"))
{
print FILE "ERR_ACCESS_DISABLED";
} else {
diff --git a/lfs/squid b/lfs/squid
index d92b8b7b3..8b907156f 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2010 IPFire Team #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -115,8 +115,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cp -f $(DIR_SRC)/config/updxlrator/updxlrator-lib.pl /var/ipfire/updatexlrator//updxlrator-lib.pl
- -mkdir -p /usr/lib/squid/errors.ipfire
- cp -fr $(DIR_SRC)/config/proxy/errors.ipfire/* /usr/lib/squid/errors.ipfire/
chmod 755 /usr/sbin/updxlrator /var/ipfire/updatexlrator/bin/checkup \
/var/ipfire/updatexlrator/bin/download \
/var/ipfire/updatexlrator/bin/convert \
@@ -143,5 +141,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
chown nobody.nobody /srv/web/ipfire/html/proxy.pac
ln -sf /srv/web/ipfire/html/proxy.pac /srv/web/ipfire/html/wpad.dat
+ #Copy stylesheets for the errorpages
+ cp -f $(DIR_SRC)/config/proxy/errorpage-ipfire.css /var/ipfire/proxy/
+ cp -f /etc/squid/errorpage.css /var/ipfire/proxy/errorpage-squid.css
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid
index 7944c708e..75dbbfa6b 100644
--- a/src/initscripts/init.d/squid
+++ b/src/initscripts/init.d/squid
@@ -7,12 +7,13 @@
chown -R squid:squid /var/log/squid
chown -R squid:squid /var/log/squidGuard
+
transparent() {
DEVICE=$1
-
+
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
eval $(/usr/local/bin/readhash /var/ipfire/proxy/settings)
-
+
# If the proxy port is not set we set the default to 800.
if [ -z $PROXY_PORT ]; then
PROXY_PORT=800
@@ -55,14 +56,22 @@ case "$1" in
evaluate_retval
exit
fi
+
+
+ eval $(/usr/local/bin/readhash /var/ipfire/proxy/advanced/settings)
+ eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
+
if [ -e /var/ipfire/proxy/enable -o -e /var/ipfire/proxy/enable_blue ]; then
+
+ # Add Address to errorpage stylesheet
+ sed "s|XXXhostXXX|$GREEN_ADDRESS|g" /var/ipfire/proxy/errorpage-$ERR_DESIGN.css > \
+ /etc/squid/errorpage.css
+
boot_mesg "Starting Squid Proxy Server..."
loadproc /usr/sbin/squid -z >/dev/null 2>&1
loadproc /usr/sbin/squid
fi
- eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
-
if [ -e /var/ipfire/proxy/transparent ]; then
transparent $GREEN_DEV
fi