From 795fba5ccf9449ff1d99fb60f72ba9dc24e93059 Mon Sep 17 00:00:00 2001 From: Landry Breuil Date: Fri, 3 Jan 2025 14:22:27 +0100 Subject: [PATCH 1/5] feat: use header config file cf georchestra/header#25 --- .../georchestra/cas/GeorchestraConfiguration.java | 12 +++--------- .../templates/georchestra/fragments/header.html | 4 +--- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/georchestra/cas/GeorchestraConfiguration.java b/src/main/java/org/georchestra/cas/GeorchestraConfiguration.java index 9837f84..f8dc68c 100644 --- 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 index 387d5b7..2431889 100644 --- a/src/main/resources/templates/georchestra/fragments/header.html +++ b/src/main/resources/templates/georchestra/fragments/header.html @@ -13,9 +13,7 @@
From 15460c6939feca22011e86cc076fca1ec0477dea Mon Sep 17 00:00:00 2001 From: Landry Breuil Date: Fri, 3 Jan 2025 14:25:21 +0100 Subject: [PATCH 2/5] update upload-artifact action to fix GHA --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8c452e8..459a860 100644 --- 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 From ec585150637089a5a4ffb60fcfb349f487d5a114 Mon Sep 17 00:00:00 2001 From: Landry Breuil Date: Fri, 3 Jan 2025 14:51:44 +0100 Subject: [PATCH 3/5] README.md: add a section about how to build the debian package --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index c787457..4056e9e 100644 --- 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: From ef343a0364fa165ab64a674e2e64f77c177e5763 Mon Sep 17 00:00:00 2001 From: Landry Breuil Date: Fri, 3 Jan 2025 14:57:49 +0100 Subject: [PATCH 4/5] fix method name to fetch the configfile --- src/main/resources/templates/georchestra/fragments/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/georchestra/fragments/header.html b/src/main/resources/templates/georchestra/fragments/header.html index 2431889..756a7af 100644 --- a/src/main/resources/templates/georchestra/fragments/header.html +++ b/src/main/resources/templates/georchestra/fragments/header.html @@ -13,7 +13,7 @@
From 3f5895fb09ea8c9aee8ba278e4746b436df42c68 Mon Sep 17 00:00:00 2001 From: Landry Breuil Date: Wed, 22 Jan 2025 14:05:20 +0100 Subject: [PATCH 5/5] readd legacy headers, and set the height attribute on the geor-header webcomponent --- .../org/georchestra/cas/GeorchestraConfiguration.java | 9 +++++++++ .../templates/georchestra/fragments/header.html | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/georchestra/cas/GeorchestraConfiguration.java b/src/main/java/org/georchestra/cas/GeorchestraConfiguration.java index f8dc68c..61effe3 100644 --- a/src/main/java/org/georchestra/cas/GeorchestraConfiguration.java +++ b/src/main/java/org/georchestra/cas/GeorchestraConfiguration.java @@ -17,15 +17,24 @@ @Data public class GeorchestraConfiguration { + @Value( "${useLegacyHeader:false}" ) + boolean useLegacyHeader = false; + @Value( "${headerConfigFile:}" ) String headerConfigFile; + @Value( "${headerUrl:/header/}" ) + String headerUrl; + @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 index 756a7af..b1cf13a 100644 --- a/src/main/resources/templates/georchestra/fragments/header.html +++ b/src/main/resources/templates/georchestra/fragments/header.html @@ -12,7 +12,10 @@
-