From fcb1797c86eb499fe79a69fb66c409855391d764 Mon Sep 17 00:00:00 2001 From: scayac Date: Mon, 5 Jan 2026 20:46:48 +0100 Subject: [PATCH] =?UTF-8?q?D=C3=A9placement=20fichiers=20html=20+=20update?= =?UTF-8?q?=20server.js/py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + index.html => html/index.html | 0 server.js | 6 +++--- server.py | 25 ++++++++++++++++--------- 4 files changed, 20 insertions(+), 12 deletions(-) rename index.html => html/index.html (100%) diff --git a/.gitignore b/.gitignore index 1669249..8934865 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .pio .vscode .git +*.pem \ No newline at end of file diff --git a/index.html b/html/index.html similarity index 100% rename from index.html rename to html/index.html diff --git a/server.js b/server.js index e0fda0d..ca3b851 100644 --- a/server.js +++ b/server.js @@ -44,9 +44,9 @@ async function startServer() { }; const server = https.createServer(options, (req, res) => { - let filePath = '.' + req.url; - if (filePath === './') { - filePath = './index.html'; + let filePath = './html' + req.url; + if (filePath === './html/') { + filePath = './html/index.html'; } const extname = String(path.extname(filePath)).toLowerCase(); diff --git a/server.py b/server.py index f44f4b4..e10e61d 100755 --- a/server.py +++ b/server.py @@ -14,12 +14,9 @@ PORT = 8443 def generate_certificate(): """Génère un certificat auto-signé si nécessaire""" - cert_file = 'cert.pem' - key_file = 'key.pem' - - if os.path.exists(cert_file) and os.path.exists(key_file): - print('✓ Certificats existants trouvés') - return cert_file, key_file + script_dir = os.path.dirname(os.path.abspath(__file__)) + cert_file = os.path.join(script_dir, 'cert.pem') + key_file = os.path.join(script_dir, 'key.pem') print('Génération d\'un certificat auto-signé...') try: @@ -38,10 +35,20 @@ def generate_certificate(): def main(): try: - cert_file, key_file = generate_certificate() + # Les certificats sont à la racine du projet + cert_file = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'cert.pem') + key_file = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'key.pem') + + # Générer si nécessaire + if not os.path.exists(cert_file) or not os.path.exists(key_file): + generate_certificate() + else: + print('✓ Certificats existants trouvés') - # Changer vers le répertoire du script - os.chdir(os.path.dirname(os.path.abspath(__file__))) + # Changer vers le répertoire html + script_dir = os.path.dirname(os.path.abspath(__file__)) + html_dir = os.path.join(script_dir, 'html') + os.chdir(html_dir) # Créer le serveur HTTP handler = http.server.SimpleHTTPRequestHandler