Bilderpfade angepasst, dass sie Contextpath übernehmen, Caddy-Reverse…

…-Proxy und Deployment des WAR in Root
Holarse-Linuxgaming · Sep 30, 2023 · 698e5c7 · 698e5c7
1 parent bc9e9e3
commit 698e5c7
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 10 deletions.
diff --git a/doc/docker-compose.yml b/doc/docker-compose.yml
@@ -4,6 +4,7 @@ version: '3.1'
 services:
   db:
     image: postgres:15
+    container_name: db
     restart: always
     environment:
       POSTGRES_USER: holarse
@@ -15,6 +16,7 @@ services:
       - website_my_pgdata:/var/lib/postgresql/data
   amq:
       image: git.holarse.de/holarse-linuxgaming/holarse/holaq:latest
+      container_name: amq
       restart: always
       ports:
           - 8161:8161
@@ -23,6 +25,7 @@ services:
           - amq_journal_data:/opt/holaq/data
   app:
       image: tomcat:11.0-jdk21-openjdk
+      container_name: app
       restart: always
       ports:
           - 8080:8080
@@ -32,6 +35,13 @@ services:
           - './tomcat/conf/tomcat-users.xml:/usr/local/tomcat/conf/tomcat-users.xml'
           - './tomcat/lib/postgresql-42.3.1.jar:/usr/local/tomcat/lib/postgresql-42.3.1.jar'
           - '../target/holarseweb.war:/usr/local/tomcat/webapps/holarseweb.war'
+  reverse-proxy:
+    container_name: reverse-proxy
+    image: caddy:latest
+    ports:
+      - "80:80"
+    volumes:
+      - ./reverse-proxy/:/etc/caddy/
 volumes:
   website_my_pgdata: 
       external: true

diff --git a/doc/reverse-proxy/Caddyfile b/doc/reverse-proxy/Caddyfile
@@ -0,0 +1,2 @@
+http://holarse-test
+reverse_proxy * app:8080
diff --git a/doc/tomcat/conf/server.xml b/doc/tomcat/conf/server.xml
@@ -148,8 +148,8 @@
                resourceName="UserDatabase"/>
       </Realm>
 
-      <Host name="localhost"  appBase="webapps"
-            unpackWARs="true" autoDeploy="true">
+      <Host name="localhost"  appBase="webapps" unpackWARs="true" autoDeploy="false" deployOnStartup="false">
+        <Context path="" docBase="holarseweb"></Context>
 
         <!-- SingleSignOn valve, share authentication between web applications
              Documentation at: /docs/config/valve.html -->

diff --git a/src/main/webapp/WEB-INF/templates/fragments/footer.html b/src/main/webapp/WEB-INF/templates/fragments/footer.html
@@ -7,7 +7,7 @@
                 <!-- Footer Content -->
                 <div class="col-lg-3 col-md-6 g-mb-40 g-mb-0--lg">
                     <a class="d-block g-mb-20" href="#" data-th-href="@{/}">
-                        <img class="img-fluid" src="/assets/images/holarse/avatar_weißer_rand_hintergrund_transparent.png" width="50%" alt="Holarse Logo A">
+                        <img class="img-fluid" data-th-src="@{/assets/images/holarse/avatar_weißer_rand_hintergrund_transparent.png}" width="50%" alt="Holarse Logo A">
                     </a>
                     <p>About Unify dolor sit amet, consectetur adipiscing elit. Maecenas eget nisl id libero tincidunt sodales.</p>
                     <p class="mb-0">Duis eleifend fermentum ante ut aliquam. Cras mi risus, dignissim sed adipiscing ut, placerat non arcu.</p>
@@ -92,7 +92,7 @@ <h4 class="h6 g-pr-20 mb-0">
 
                 <!-- Footer Content -->
                 <div class="col-lg-3 col-md-6">
-                    <img class="img-fluid" src="/assets/images/holarse/penguin_computing_tux.png" width="50%" alt="Fragging Tux">
+                    <img class="img-fluid" data-th-src="@{/assets/images/holarse/penguin_computing_tux.png}" width="50%" alt="Fragging Tux">
                 </div>
                 <!-- End Footer Content -->
             </div>

diff --git a/src/main/webapp/WEB-INF/templates/fragments/header.html b/src/main/webapp/WEB-INF/templates/fragments/header.html
@@ -18,8 +18,8 @@
                 <!-- End Responsive Toggle Button -->
 
                 <!-- Logo -->
-                <a href="/" class="navbar-brand u-header__logo">
-                    <img class="u-header__logo-img u-header__logo-img--main" width="75%" src="/assets/images/holarse/holarse_logo_text.svg" alt="Holarse - Spielen unter Linux">
+                <a data-th-href="@{/}" class="navbar-brand u-header__logo">
+                    <img class="u-header__logo-img u-header__logo-img--main" width="75%" data-th-src="@{/assets/images/holarse/holarse_logo_text.svg}" alt="Holarse - Spielen unter Linux">
                 </a>
                 <!-- End Logo -->
 

diff --git a/src/main/webapp/WEB-INF/templates/sites/sessions/login.html b/src/main/webapp/WEB-INF/templates/sites/sessions/login.html
@@ -15,7 +15,7 @@ <h2 class="h2 g-color-black g-font-weight-600">Login</h2>
                 </div>
 
                 <div class="g-mb-35">
-                    <label class="g-color-gray-dark-v2 g-font-weight-600 g-font-size-13">Password:</label>
+                    <label class="g-color-gray-dark-v2 g-font-weight-600 g-font-size-13">Password</label>
                     <input class="form-control g-color-black g-bg-white g-bg-white--focus g-brd-gray-light-v4 g-brd-primary--hover rounded g-py-15 g-px-15 mb-3" type="password" placeholder="Password" name="password">
                     <small data-th-if="${#fields.hasErrors('password')}" data-th-errorclass="error" data-th-errors="*{password}" class="form-control-feedback d-block g-bg-red g-color-white g-font-size-12 g-px-14 g-py-3 mt-0" />                    
                     <div class="row justify-content-between">
@@ -25,17 +25,17 @@ <h2 class="h2 g-color-black g-font-weight-600">Login</h2>
                                 <div class="u-check-icon-checkbox-v6 g-absolute-centered--y g-left-0">
                                     <i class="fa" data-check-icon="&#xf00c"></i>
                                 </div>
-                                Keep signed in
+                                Angemeldet bleiben
                             </label>
                         </div>
                         <div class="col align-self-center text-right">
-                            <a class="g-font-size-12" href="#!">Forgot password?</a>
+                            <a class="g-font-size-12" href="#!">Passwort vergessen?</a>
                         </div>
                     </div>
                 </div>
 
                 <div class="mb-4">
-                    <button class="btn btn-md btn-block u-btn-primary rounded g-py-13" type="submit">Login</button>
+                    <button class="btn btn-md btn-block u-btn-primary rounded g-py-13" type="submit">Anmelden</button>
                 </div>
             </form>
             <!-- End Form -->