diff --git a/mkosi.skeleton/srv/niver/core b/mkosi.skeleton/srv/niver/core index a63cf55..068dc82 160000 --- a/mkosi.skeleton/srv/niver/core +++ b/mkosi.skeleton/srv/niver/core @@ -1 +1 @@ -Subproject commit a63cf55c722e2a9bdb6c1b1d3b7d861fb7ae7f8f +Subproject commit 068dc82a542178c56fd1b49e4309e5b1b994ca4f diff --git a/mkosi.skeleton/srv/niver/docs b/mkosi.skeleton/srv/niver/docs index 5bd2bca..fbe7149 160000 --- a/mkosi.skeleton/srv/niver/docs +++ b/mkosi.skeleton/srv/niver/docs @@ -1 +1 @@ -Subproject commit 5bd2bcaad16a46bb01db04f862c09e14f248a4e8 +Subproject commit fbe714909c09701253c3f7e6254a2fab42b35161 diff --git a/mkosi.skeleton/srv/niver/errors/400.html b/mkosi.skeleton/srv/niver/errors/400.html index 04bdaf1..6330cbe 100644 --- a/mkosi.skeleton/srv/niver/errors/400.html +++ b/mkosi.skeleton/srv/niver/errors/400.html @@ -1,7 +1,7 @@ - + Bad request · HTTP 400 @@ -10,6 +10,6 @@

The request is malformed.

- HTTP 400 + HTTP 400 diff --git a/mkosi.skeleton/srv/niver/errors/403.html b/mkosi.skeleton/srv/niver/errors/403.html index d678b35..1c2fa6e 100644 --- a/mkosi.skeleton/srv/niver/errors/403.html +++ b/mkosi.skeleton/srv/niver/errors/403.html @@ -1,7 +1,7 @@ - + Access forbidden · HTTP 403 @@ -10,6 +10,6 @@

The server refused to process the request for security reasons.

- HTTP 403 + HTTP 403 diff --git a/mkosi.skeleton/srv/niver/errors/404.en.html b/mkosi.skeleton/srv/niver/errors/404.en.html index f7985d9..d09c1d5 100644 --- a/mkosi.skeleton/srv/niver/errors/404.en.html +++ b/mkosi.skeleton/srv/niver/errors/404.en.html @@ -1,7 +1,7 @@ - + File not found · HTTP 404 @@ -14,6 +14,6 @@
  • The file may have been moved or deleted.
  • Perhaps the address was mistyped.
    • - HTTP 404 + HTTP 404 diff --git a/mkosi.skeleton/srv/niver/errors/404.fr.html b/mkosi.skeleton/srv/niver/errors/404.fr.html index 3f81091..b9748e7 100644 --- a/mkosi.skeleton/srv/niver/errors/404.fr.html +++ b/mkosi.skeleton/srv/niver/errors/404.fr.html @@ -1,7 +1,7 @@ - + Fichier introuvable · HTTP 404 @@ -11,9 +11,9 @@ Le serveur n'a rien trouvé à l'adresse demandée.

    - HTTP 404 + HTTP 404 diff --git a/mkosi.skeleton/srv/niver/errors/404.php b/mkosi.skeleton/srv/niver/errors/404.php index 425db2f..e58f81c 100644 --- a/mkosi.skeleton/srv/niver/errors/404.php +++ b/mkosi.skeleton/srv/niver/errors/404.php @@ -16,5 +16,3 @@ if (isset($locale) AND $locale == "fr") echo file_get_contents("404.fr.html"); else echo file_get_contents("404.en.html"); - -?> diff --git a/mkosi.skeleton/srv/niver/errors/405.html b/mkosi.skeleton/srv/niver/errors/405.html index 1945473..c99d58a 100644 --- a/mkosi.skeleton/srv/niver/errors/405.html +++ b/mkosi.skeleton/srv/niver/errors/405.html @@ -1,7 +1,7 @@ - + Method Not Allowed · HTTP 405 @@ -10,6 +10,6 @@

    The request method is not supported for this resource.

    - HTTP 405 + HTTP 405 diff --git a/mkosi.skeleton/srv/niver/errors/410.html b/mkosi.skeleton/srv/niver/errors/410.html index ff5f6ce..7b44cd6 100644 --- a/mkosi.skeleton/srv/niver/errors/410.html +++ b/mkosi.skeleton/srv/niver/errors/410.html @@ -1,7 +1,7 @@ - + Gone · HTTP 410 @@ -10,6 +10,6 @@

    The requested resource is not available anymore.

    - HTTP 410 + HTTP 410 diff --git a/mkosi.skeleton/srv/niver/errors/418.html b/mkosi.skeleton/srv/niver/errors/418.html index 112b012..fcf0bf9 100644 --- a/mkosi.skeleton/srv/niver/errors/418.html +++ b/mkosi.skeleton/srv/niver/errors/418.html @@ -1,7 +1,7 @@ - + I'm a teapot · HTTP 418 @@ -10,6 +10,6 @@

    Your coffee cannot be brewed because this server is a teapot.

    - HTTP 418 + HTTP 418 diff --git a/mkosi.skeleton/srv/niver/errors/500.html b/mkosi.skeleton/srv/niver/errors/500.html index 969e90b..88a41d5 100644 --- a/mkosi.skeleton/srv/niver/errors/500.html +++ b/mkosi.skeleton/srv/niver/errors/500.html @@ -1,7 +1,7 @@ - + Server error · HTTP 500 @@ -14,6 +14,6 @@
  • This error is probably temporary.
  • If it isn't, you can try to contact an administrator.
    • - HTTP 500 + HTTP 500 diff --git a/mkosi.skeleton/srv/niver/errors/502.html b/mkosi.skeleton/srv/niver/errors/502.html index e3b10e0..7e55459 100644 --- a/mkosi.skeleton/srv/niver/errors/502.html +++ b/mkosi.skeleton/srv/niver/errors/502.html @@ -1,7 +1,7 @@ - + Bad gateway · HTTP 502 @@ -14,6 +14,6 @@
  • This error is probably temporary.
  • If it isn't, you can try to contact an administrator.
    • - HTTP 502 + HTTP 502 diff --git a/mkosi.skeleton/srv/niver/errors/503.html b/mkosi.skeleton/srv/niver/errors/503.html index 9c624d4..7e84963 100644 --- a/mkosi.skeleton/srv/niver/errors/503.html +++ b/mkosi.skeleton/srv/niver/errors/503.html @@ -1,7 +1,7 @@ - + Service unavailable · HTTP 503 @@ -14,6 +14,6 @@
  • This error is probably temporary.
  • If it isn't, you can try to contact an administrator.
    • - HTTP 503 + HTTP 503 diff --git a/mkosi.skeleton/srv/niver/errors/504.html b/mkosi.skeleton/srv/niver/errors/504.html index 6b63932..3a3b928 100644 --- a/mkosi.skeleton/srv/niver/errors/504.html +++ b/mkosi.skeleton/srv/niver/errors/504.html @@ -1,7 +1,7 @@ - + Gateway timeout · HTTP 504 @@ -14,6 +14,6 @@
  • This error is probably temporary.
  • If it isn't, you can try to contact an administrator.
    • - HTTP 504 + HTTP 504 diff --git a/mkosi.skeleton/srv/niver/errors/default-domain.en.html b/mkosi.skeleton/srv/niver/errors/default-domain.en.html index da4e656..c1d3c69 100644 --- a/mkosi.skeleton/srv/niver/errors/default-domain.en.html +++ b/mkosi.skeleton/srv/niver/errors/default-domain.en.html @@ -1,11 +1,15 @@ - + + Broken site

    Broken site

    - The site you're trying to reach is misconfigured. This domain seems to be pointing to this server, but this server is not aware of a site using this domain. +

    + The site you're trying to reach is misconfigured. This domain seems to be pointing to this server, but this server is not aware of a site using this domain. +

    + HTTP 404 diff --git a/mkosi.skeleton/srv/niver/errors/default-ip.en.html b/mkosi.skeleton/srv/niver/errors/default-ip.en.html index 92e9057..d7a219b 100644 --- a/mkosi.skeleton/srv/niver/errors/default-ip.en.html +++ b/mkosi.skeleton/srv/niver/errors/default-ip.en.html @@ -1,11 +1,15 @@ - + + Nothing here

    Nothing here

    - You reached Niver's default site using IP address. There's nothing for you here. +

    + You reached Niver's default site using IP address. There's nothing for you here. +

    + HTTP 404 diff --git a/mkosi.skeleton/srv/niver/errors/http.html b/mkosi.skeleton/srv/niver/errors/http.html deleted file mode 100644 index 644aae5..0000000 --- a/mkosi.skeleton/srv/niver/errors/http.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - Not available over unsecure HTTP - - -

    Not available over unsecure HTTP

    -

    - This server does not accept unsecure HTTP requests. Use HTTPS instead. -

    -
    - What happened? - You made a request to the server using the unsecure HTTP protocol (http://). For privacy and security reasons, the server does not accept this, as unsecure HTTP connections can be watched and modified by any device on the way. -
    -
    - How to solve this? - You can tell your browser to use HTTPS by prefixing the URL with https://. -
    - HTTP 400 - - diff --git a/mkosi.skeleton/srv/niver/errors/http.php b/mkosi.skeleton/srv/niver/errors/http.php index e0e7712..264a911 100644 --- a/mkosi.skeleton/srv/niver/errors/http.php +++ b/mkosi.skeleton/srv/niver/errors/http.php @@ -1,45 +1,21 @@ - - - - - - - Not available over unsecure HTTP - - -

    Not available over unsecure HTTP

    -

    - This server does not accept unsecure HTTP requests. Use HTTPS instead. -

    -
    - What happened? - You made a request to the server using the unsecure HTTP protocol (http://). For privacy and security reasons, the server does not accept this, as unsecure HTTP connections can be watched and modified by any device on the way. -
    -
    - How to solve this? - You can tell your browser to use HTTPS by prefixing the URL with https://. -
    - HTTP 403 - - - - +if (isset($locale) AND $locale === "fr") + require "unsecure.fr.php"; +else + require "unsecure.en.php"; diff --git a/mkosi.skeleton/srv/niver/errors/index.php b/mkosi.skeleton/srv/niver/errors/index.php index dfc9602..7cfc015 100644 --- a/mkosi.skeleton/srv/niver/errors/index.php +++ b/mkosi.skeleton/srv/niver/errors/index.php @@ -1,8 +1,8 @@ diff --git a/mkosi.skeleton/srv/niver/errors/unsecure.en.php b/mkosi.skeleton/srv/niver/errors/unsecure.en.php new file mode 100644 index 0000000..3aca026 --- /dev/null +++ b/mkosi.skeleton/srv/niver/errors/unsecure.en.php @@ -0,0 +1,23 @@ + + + + + + TLS required + + +

    TLS required

    +

    + This site does not accept HTTP requests without TLS. +

    +

    What happened?

    +

    + You made a request using HTTP without TLS to the server, which refused this for privacy and security reasons, as unsecure HTTP connections can be watched and modified by any device on the way. +

    +

    How to solve this?

    +

    + You can replace the URI scheme http by https to tell your client to make the request using TLS. +

    + HTTP 403 + + diff --git a/mkosi.skeleton/srv/niver/errors/unsecure.fr.php b/mkosi.skeleton/srv/niver/errors/unsecure.fr.php new file mode 100644 index 0000000..655cb2b --- /dev/null +++ b/mkosi.skeleton/srv/niver/errors/unsecure.fr.php @@ -0,0 +1,23 @@ + + + + + + Nécessite TLS + + +

    Nécessite TLS

    +

    + Ce site n'accepte pas les connexions HTTP sans TLS. +

    +

    Que s'est-il passé ?

    +

    + Vous avez envoyé une requête HTTP sans TLS au serveur, qui l'a refusée pour des raisons de sécurité et de confidentialité. +

    +

    Comment régler ce problème ?

    +

    + Vous pouvez remplacer le schéma d'URI http par https pour indiquer à votre client de faire la requête avec TLS. +

    + HTTP 403 + +