Merge-Konflikte gelöst: Remote-Version übernommen

neue Fassaung
2025-11-05 11:40:16 +01:00 · 2025-11-05 09:21:47 +01:00
9 changed files with 245 additions and 2590 deletions
--- a/gittea.sh
+++ b/gittea.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+# ============================================================
+# 🧰 Gitea SSH Fix Script (Version 3)
+# Führt vollständige Reparatur von SSH-Keys, Hooks & Rechten durch
+# ============================================================
+
+set -euo pipefail
+grn='\e[32m'; red='\e[31m'; yel='\e[33m'; nc='\e[0m'
+
+echo -e "${grn}🔧 Starte Gitea SSH-Reparatur...${nc}"
+
+# 1️⃣ Gitea-Binary prüfen
+GITEA_BIN=$(command -v gitea || echo "/usr/local/bin/gitea")
+echo -e "${grn}➡ Verwende Gitea-Binary:${nc} $GITEA_BIN"
+
+# 2️⃣ Gitea stoppen
+echo -e "${yel}⏹ Stoppe Gitea-Service...${nc}"
+systemctl stop gitea || echo -e "${red}⚠️  Konnte Gitea nicht stoppen (evtl. nicht aktiv).${nc}"
+
+# 3️⃣ Hooks & Keys regenerieren (richtig: als Benutzer 'git')
+echo -e "${grn}♻️  Regeneriere Hooks und Keys...${nc}"
+sudo -u git "$GITEA_BIN" --config /etc/gitea/app.ini --work-path /var/lib/gitea admin regenerate hooks
+sudo -u git "$GITEA_BIN" --config /etc/gitea/app.ini --work-path /var/lib/gitea admin regenerate keys
+
+# 4️⃣ Berechtigungen für .ssh korrigieren
+echo -e "${grn}🧱  Setze Berechtigungen für .ssh...${nc}"
+chown -R git:git /home/git/.ssh
+chmod 700 /home/git/.ssh
+chmod 600 /home/git/.ssh/authorized_keys
+
+# 5️⃣ authorized_keys prüfen
+if ! grep -q "command=" /home/git/.ssh/authorized_keys; then
+  echo -e "${yel}⚠️  Kein 'command='-Eintrag gefunden – ergänze Gitea-Zeile...${nc}"
+  FIRST_KEY=$(head -n 1 /home/git/.ssh/authorized_keys | awk '{print $NF}')
+  echo "command=\"$GITEA_BIN --config=/etc/gitea/app.ini serv key-1\",no-port-forwarding,no-agent-forwarding,no-pty ssh-ed25519 $FIRST_KEY" > /home/git/.ssh/authorized_keys
+  chown git:git /home/git/.ssh/authorized_keys
+  chmod 600 /home/git/.ssh/authorized_keys
+else
+  echo -e "${grn}✅  authorized_keys sieht gut aus.${nc}"
+fi
+
+# 6️⃣ Gitea starten
+echo -e "${grn}🚀  Starte Gitea neu...${nc}"
+systemctl start gitea
+
+# 7️⃣ SSH-Test lokal
+echo -e "${yel}🔍  Kurzer SSH-Test (lokal)...${nc}"
+sudo -u git ssh -T git@localhost || true
+
+echo -e "\n${grn}✅  Gitea SSH-Fix abgeschlossen.${nc}"
+echo -e "Teste jetzt bitte extern mit:\n  ssh -T git@illg.me\noder\n  git push"
--- a/index.php
+++ b/index.php
@@ -25,17 +25,15 @@ if ($tab == "") {$tab = "home";}
    <link rel="stylesheet" type="text/css" href="main/min-style.css">
    <script src="main/lightbox-plus-jquery.min.js"></script>
    <link rel="stylesheet" type="text/css" href="main/lightbox.min.css">
-    <link href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;700&display=swap" rel="stylesheet">
    <script src="main/nav2.js"></script>
    <script src="main/.js"></script>
    <script src="main/schnee.js"></script>
    <!--script src="main/schneeTeet.js"></script-->
-    <link rel="preload" as="image" href="inc/bg/hufeisen_pattern_1024.webp">


 </head>

-<!--?php include('main/overlayDebug.js');?-->
+

 <!--header in tap/nav2.php  -->
    
@@ -44,12 +42,10 @@ if ($tab == "") {$tab = "home";}
 <!--body id="winter"-->
 <body>
    
-
    
-    <div class="bg-layer"></div>
-<!--div class="develop">
+<div class="develop">
    <h1>!!! Develop !!!</h1>
-</div-->
+</div>


 <article>
@@ -58,15 +54,8 @@ if ($tab == "") {$tab = "home";}

 </article>

-<div id="snowman">
-  <img src="./inc/bg/1605110464788.png" alt="Schneemann" />
-</div>
-
 <footer>
-    <!--img class="bgTree" src="./inc/bg/golden_christmas_tree.png"></img-->
-    
-    
-    <!--img src="./inc/bg/1605110464788.png"></img-->
+    <img src="./inc/bg/1605110464788.png"></img>
    <a href="?tab=impressum" <?php if ($tab == "impressum")?>>Impressum</a> <span id="footer2">-</span>
    <a href="?tab=datenschutz" <?php if ($tab == "datenschutz")?>>Datenschutz</a> <span id="footer2">-</span>
    <!--a href="?tab=datenschutz" <?php if ($tab == "danke")?>>Danke an...</a> <span id="footer2">-</span-->
--- a/main/min-style.css
+++ b/main/min-style.css
--- a/main/min-style.css.map
+++ b/main/min-style.css.map
--- a/src/sass/_nav2.sass
+++ b/src/sass/_nav2.sass
@@ -27,6 +27,8 @@ $nav-background2: url("../inc/bg/christmas-banner-6739203.jpg") 0 86% no-repeat
  background-size: 100%
  border-bottom: 4px ridge $siteColor
  background-size: 100%
+  position: relative
+  z-index: 10000

 // Logo and branding
 .brand
@@ -162,6 +164,8 @@ nav
@media screen and (min-width: $breakpoint) 
  .nav-list 
    display: block !important
+    position: relative
+    z-index: 10001
  
 #nav-toggle 
  position: absolute
--- a/src/sass/_tueren.sass
+++ b/src/sass/_tueren.sass
@@ -38,22 +38,29 @@
    width: clamp(100px, 18vw, 150px)
      
  #bibi
-    @include personen-txt(darkgreen)
+    @include personen-txt(#007a4e)

  #melly
-    @include personen-txt($melly)
+    @include personen-txt(#6D1F74)
  
  #packa
-    @include personen-txt(darkgreen)
+    @include personen-txt(#125035)
    
  #tina
    @include personen-txt(#8b7500)
    
  #alex
-    @include personen-txt(#36648b)
+    @include personen-txt(#343992)
    
  #otherPerson
    @include personen-txt(black)
+    
+  #txtGedanken
+    @include personen-txt(#11486D)
+    
+  #txtLesung
+    @include personen-txt(#676668)
+    //text-decoration: underline

  #schneiiW
    display: inline-block
--- a/src/sass/main.sass
+++ b/src/sass/main.sass
@@ -27,13 +27,6 @@ body
  background-position: top center
  position: relative
  
-.navigation
-  position: relative
-  z-index: 10000
-
-.nav-list
-  position: relative
-  z-index: 10001

 article
  position: relative
--- a/tab/home.php
+++ b/tab/home.php
@@ -14,8 +14,6 @@
 </div>


-
-
 <div class="TimeContainer">
    <div id="clockdiv">
        <div>
@@ -64,10 +62,10 @@

    console.log(images);
    var deadline = new Date("Dec1, 2025 00:00").getTime();
-    var advent1 = new Date("2025-11-30");
-    var advent2 = new Date("2025-12-07");
-    var advent3 = new Date("2025-12-14");
-    var advent4 = new Date("2025-12-21");
+    var advent1 = new Date("2024-12-01");
+    var advent2 = new Date("2024-12-08");
+    var advent3 = new Date("2024-12-15");
+    var advent4 = new Date("2024-12-22");
    if(advent1.getTime()<=getNow().getTime()) {
        $("#kerze1").show();
    }
--- a/tab/tuer.php
+++ b/tab/tuer.php
Author	SHA1	Message	Date
root	88b6e35593	Merge-Konflikte gelöst: Remote-Version übernommen	2025-11-05 11:40:16 +01:00
Jason	1e30dac000	neue Fassaung	2025-11-05 09:21:47 +01:00