Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use header config file #32

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

feat: use header config file #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
795fba5
feat: use header config file
landryb Jan 3, 2025
15460c6
update upload-artifact action to fix GHA
landryb Jan 3, 2025
ec58515
README.md: add a section about how to build the debian package
landryb Jan 3, 2025
ef343a0
fix method name to fetch the configfile
landryb Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 3 additions & 9 deletions src/main/java/org/georchestra/cas/GeorchestraConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 1 addition & 3 deletions src/main/resources/templates/georchestra/fragments/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading