Skip to content

Commit

Permalink
Tomcat version added to installation description (#1039)
Browse files Browse the repository at this point in the history
* Fix relative local link checks and check fragments

---------

Co-authored-by: MichaIng <[email protected]>
  • Loading branch information
StephanStS and MichaIng authored Dec 8, 2024
1 parent 1ca5012 commit 5b3c3ff
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ jobs:
# Skip on push events into master
if: always() && steps.build.outcome == 'success' && ! endsWith(github.ref, '/master')
run: |
curl -sSfL "$(curl -sSfH 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' 'https://api.github.com/repos/lycheeverse/lychee/releases/latest' | mawk -F\" '/"browser_download_url.*x86_64-unknown-linux-musl\.tar\.gz"/{print $4;exit}')" -o lychee.tar.gz
# Workaround for broken local link checks in v0.17.0: https://github.com/lycheeverse/lychee/issues/1574
#curl -sSfL "$(curl -sSfH 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' 'https://api.github.com/repos/lycheeverse/lychee/releases/latest' | mawk -F\" '/"browser_download_url.*x86_64-unknown-linux-musl\.tar\.gz"/{print $4;exit}')" -o lychee.tar.gz
curl -sSfL 'https://github.com/lycheeverse/lychee/releases/download/lychee-v0.16.1/lychee-x86_64-unknown-linux-musl.tar.gz' -o lychee.tar.gz
tar xf lychee.tar.gz
- name: Run lychee to check README and HTML files
if: always() && steps.lychee.outcome == 'success'
Expand All @@ -68,4 +70,4 @@ jobs:
git fetch --depth=1 origin master
while read -r line; do exclude="$exclude|dietpi.com/${line%.md}/"; done < <(git diff --name-only --diff-filter=A origin/master docs | grep '.md$')
while read -r line; do exclude="$exclude|github.com/MichaIng/DietPi-Docs/(raw|edit)/dev/$line"; done < <(find docs -type f -name '*.md')
./lychee -En --require-https --cache --exclude '^(http://wiringpi.com/$|https://(www.wireguard.com/$|twitter.com/DietPi_$|www.patreon.com/DietPi$|www.linux-kvm.org/$|www.domoticz.com/|pydio.com/|www.spigotmc.org/|help.realvnc.com/|help.roonlabs.com/|blynk.io/|play.google.com/store/apps/details|www.kickstarter.com|theunarchiver.com/$|www.parallels.com/|(www|forums).raspberrypi.com/|www.reddit.com/|superuser.com|chromewebstore.google.com'"$exclude"'))' -a 429 --github-token '${{ secrets.GITHUB_TOKEN }}' -b build README.md 'build/**/*.html'
./lychee -En --require-https --cache --include-fragments --exclude '^(http://wiringpi.com/$|https://(www.wireguard.com/$|twitter.com/DietPi_$|www.patreon.com/DietPi$|www.linux-kvm.org/$|www.domoticz.com/|pydio.com/|www.spigotmc.org/|help.realvnc.com/|help.roonlabs.com/|blynk.io/|play.google.com/store/apps/details|www.kickstarter.com|theunarchiver.com/$|www.parallels.com/|(www|forums).raspberrypi.com/|www.reddit.com/|superuser.com|chromewebstore.google.com'"$exclude"'))' -a 429 --github-token '${{ secrets.GITHUB_TOKEN }}' -b build README.md 'build/**/*.html'
14 changes: 10 additions & 4 deletions docs/software/webserver_stack.md
Original file line number Diff line number Diff line change
Expand Up @@ -498,14 +498,20 @@ Source: [The Apache Software Foundation](https://svn.apache.org/viewvc/jakarta/s

=== "Install"

Starting with DietPi 7.3 `Tomcat 8` has been removed from the DietPi Software List. The reason is that `Tomcat 8` is available until Debian Stretch only. From Debian Buster and newer versions, it will be supported only Tomcat 9.
Depending on the Debian version, different Apache Tomcat versions are compatible (see also the [Debian Tomcat package information](https://packages.debian.org/search?section=all&arch=any&searchon=names&keywords=tomcat)):

To install Tomcat 9, run next command in the console:
| Debian version | Installation command |
| - | - |
| Debian 12 (Bookworm) | `apt install tomcat10`|
| Debian 11 (Bullseye) | `apt install tomcat9`|
| Debian 10 (Buster) | `apt install tomcat9`|
| Debian 9 (Stretch) | `apt install tomcat8`|

To install Tomcat, run the according command in the console, e.g. for Debian Bookworm:

```sh
apt install tomcat9
apt install tomcat10
```

=== "Quick access"

The web interface is accessible via port **8080**:
Expand Down

0 comments on commit 5b3c3ff

Please sign in to comment.