Merge branch 'header-config-file' into 24.0.x-craig

landryb · Jan 7, 2025 · a5323fc · a5323fc
2 parents 0670560 + ef343a0
commit a5323fc
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -37,7 +37,7 @@ jobs:
 
       - name: publish the artifact
         if: github.repository == 'georchestra/georchestra-cas-server' && github.ref == 'refs/heads/master'
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: cas.war
           path: build/libs/cas.war

diff --git a/README.md b/README.md
@@ -23,6 +23,14 @@ Custom georchestra build
 ./gradlew build
 ```
 
+## Building a debian package
+
+```
+./gradlew deb
+```
+
+The resulting deb is in `build/distributions/`
+
 ## Building a docker image
 
 Creating the exploded webapp with the following:

diff --git a/src/main/java/org/georchestra/cas/GeorchestraConfiguration.java b/src/main/java/org/georchestra/cas/GeorchestraConfiguration.java
@@ -17,21 +17,15 @@
 @Data
 public class GeorchestraConfiguration {
 
-    @Value( "${useLegacyHeader:false}" )
-    boolean useLegacyHeader = false;
+    @Value( "${headerConfigFile:}" )
+    String headerConfigFile;
 
-    @Value( "${headerUrl:/header/}" )
-    String headerUrl;
-
-    @Value("${headerHeight:90}")
+    @Value("${headerHeight:80}")
     String headerHeight;
 
     @Value("${headerScript:https://cdn.jsdelivr.net/gh/georchestra/header@dist/header.js}")
     String headerScript;
 
-    @Value("${logoUrl:https://www.georchestra.org/public/georchestra-logo.svg}")
-    String logoUrl;
-
     @Value("${georchestraStylesheet:}")
     String georchestraStylesheet;
 

diff --git a/src/main/resources/templates/georchestra/fragments/header.html b/src/main/resources/templates/georchestra/fragments/header.html
@@ -13,9 +13,7 @@
 <body>
 <div th:fragment="header">
     <geor-header th:style="'width:100%;height:'+ ${@georchestraConfiguration.getHeaderHeight()}+'px;border:none;overflow:hidden;'"
-                 th:legacy-url="${@georchestraConfiguration.getHeaderUrl()}"
-                 th:legacy-header="${@georchestraConfiguration.isUseLegacyHeader()}"
-                 th:logo-url="${@georchestraConfiguration.getLogoUrl()}"
+                 th:config-file="${@georchestraConfiguration.getHeaderConfigFile()}"
                  th:stylesheet="${@georchestraConfiguration.getGeorchestraStylesheet()}"
     ></geor-header>
     <script th:src="${@georchestraConfiguration.getHeaderScript()}"></script>