Skip to content

Commit

Permalink
Merge pull request #157 from linuxserver/tacacs
Browse files Browse the repository at this point in the history
  • Loading branch information
thespad authored Jul 24, 2023
2 parents 5c3cbd2 + a0e0d91 commit 781d4e3
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 2 deletions.
10 changes: 9 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ RUN \
SMOKEPING_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
&& awk '/^P:smokeping$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
fi && \
apk add --no-cache --virtual=build-dependencies \
build-base \
perl-app-cpanminus \
perl-dev && \
apk add --no-cache \
apache2 \
apache2-ctl \
Expand All @@ -30,12 +34,16 @@ RUN \
ssmtp \
sudo \
tcptraceroute && \
echo "**** Build perl TacacsPlus module ****" && \
cpanm Authen::TacacsPlus && \
echo "**** give setuid access to traceroute & tcptraceroute ****" && \
chmod a+s /usr/bin/traceroute && \
chmod a+s /usr/bin/tcptraceroute && \
echo "**** fix path to cropper.js ****" && \
sed -i 's#src="/cropper/#/src="cropper/#' /etc/smokeping/basepage.html && \
echo "**** remove default apache conf ****" && \
echo "**** Cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \
/tmp/* \
/etc/apache2/httpd.conf
Expand Down
10 changes: 9 additions & 1 deletion Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ RUN \
SMOKEPING_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
&& awk '/^P:smokeping$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
fi && \
apk add --no-cache --virtual=build-dependencies \
build-base \
perl-app-cpanminus \
perl-dev && \
apk add --no-cache \
apache2 \
apache2-ctl \
Expand All @@ -30,12 +34,16 @@ RUN \
ssmtp \
sudo \
tcptraceroute && \
echo "**** Build perl TacacsPlus module ****" && \
cpanm Authen::TacacsPlus && \
echo "**** give setuid access to traceroute & tcptraceroute ****" && \
chmod a+s /usr/bin/traceroute && \
chmod a+s /usr/bin/tcptraceroute && \
echo "**** fix path to cropper.js ****" && \
sed -i 's#src="/cropper/#/src="cropper/#' /etc/smokeping/basepage.html && \
echo "**** remove default apache conf ****" && \
echo "**** Cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \
/tmp/* \
/etc/apache2/httpd.conf
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **23.07.23:** - Add Authen::TacacsPlus for Tacacs+ support.
* **16.05.23:** - Add perl-authen-radius for Radius support.
* **16.05.23:** - Rebase to Alpine 3.18. Deprecate armhf.
* **11.05.23:** - Add perl-lwp-protocol-https for master/slave support over https.
Expand Down
1 change: 1 addition & 0 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "23.07.23:", desc: "Add Authen::TacacsPlus for Tacacs+ support." }
- { date: "16.05.23:", desc: "Add perl-authen-radius for Radius support." }
- { date: "16.05.23:", desc: "Rebase to Alpine 3.18. Deprecate armhf." }
- { date: "11.05.23:", desc: "Add perl-lwp-protocol-https for master/slave support over https." }
Expand Down

0 comments on commit 781d4e3

Please sign in to comment.