Skip to content

Commit 5f79c93

Browse files
Other misc changes
1 parent 1baabb0 commit 5f79c93

File tree

4 files changed

+67
-3
lines changed

4 files changed

+67
-3
lines changed

.github/workflows/build_and_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88

99
steps:
1010
- uses: actions/checkout@v3
11-
- name: Set up JDK 11
11+
- name: Set up JDK 21
1212
uses: actions/setup-java@v4
1313
with:
1414
java-version: '21'

.github/workflows/docs_site.yml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# Sample workflow for building and deploying a Jekyll site to GitHub Pages
2+
name: Deploy Jekyll with GitHub Pages dependencies preinstalled
3+
4+
on:
5+
# Runs on pushes targeting the default branch
6+
push:
7+
branches: ["main"]
8+
9+
# Allows you to run this workflow manually from the Actions tab
10+
workflow_dispatch:
11+
12+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
13+
permissions:
14+
contents: read
15+
pages: write
16+
id-token: write
17+
18+
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
19+
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
20+
concurrency:
21+
group: "pages"
22+
cancel-in-progress: false
23+
24+
jobs:
25+
# Build job
26+
build:
27+
runs-on: ubuntu-latest
28+
steps:
29+
- uses: actions/checkout@v4
30+
- uses: actions/setup-python@v5
31+
with:
32+
python-version: '3.10'
33+
cache: 'pip'
34+
- name: Build Mkdocs
35+
run: |
36+
pip install mkdocs mkdocs-awesome-nav
37+
mkdocs build
38+
- uses: actions/setup-java@v4
39+
with:
40+
java-version: '21'
41+
distribution: 'adopt'
42+
cache: 'maven'
43+
- name: Build Javadoc and Enunciate Swagger UI
44+
run: |
45+
mvn --batch-mode -Preproducible compile javadoc:javadoc javadoc:aggregate
46+
cp -r target/reports/apidocs site/apidocs
47+
cp -r proxyserver/target/enunciate-docs/apidocs site/endpoints
48+
# Add a setting to swagger-ui to turn off the "Try it now" buttons
49+
sed -i 's/url\: url/url\: url\, supportedSubmitMethods\: \[\]/' site/endpoints/ui/swagger-initializer.js
50+
- name: Upload artifact
51+
uses: actions/upload-pages-artifact@v3
52+
with:
53+
path: site/
54+
55+
# Deployment job
56+
deploy:
57+
environment:
58+
name: github-pages
59+
url: ${{ steps.deployment.outputs.page_url }}
60+
runs-on: ubuntu-latest
61+
needs: build
62+
steps:

docs/.nav.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ nav:
33
- developing.md
44
- operations_guide/index.md
55
- architecture.md
6+
- "REST API Docs 🔗": /endpoints
7+
- "Javadocs 🔗": /apidocs
68
- "*"

docs/https.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ We are still working to improve the steps, but current the process is:
1919
Something like `openssl rand -base64 12` will generate 16 characters securely.
2020
* You can also set a `MONITORING_EMAIL` which will be used for email renewal reminders from Lets Encrypt.
2121
2. Start up the docker containers (see [setup.md](setup.md)).
22-
3. Start a bash shell inside the running container: `docker exec -it efileproxyserver-efspjava-1 /bin/sh`
22+
3. Start a shell inside the running container: `docker exec -it efileproxyserver-efspjava-1 /bin/sh`
2323
4. Change directories to the app: `cd /app`.
2424
5. Run the ACME renewal process: `java -cp efspserver-with-deps.jar edu.suffolk.litlab.efspserver.services.acme.AcmeRenewal renew`.
2525
If the renewal process succeeded, `acme-domain-chain.crt` and `tls_server_cert.jks`
2626
should both be present in `/tmp/tls_certs` inside the container and in `src/main/config` outside the container.
27-
6. Exit the bash shell you started, and rebuild and restart the java docker container.
27+
6. Exit the shell you started, and rebuild and restart the java docker container.
2828

2929
The newly started container should be able to serve HTTPS correctly!
3030

0 commit comments

Comments
 (0)