diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 34648ef..a21e880 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,9 +19,10 @@ release-hosted: stage: release-hosted image: alpine:latest variables: - VERSION: "1.0.0" + VERSION: "1.0.1" script: - apk add --no-cache curl + - chmod a+x hosted/install.sh - tar -czvf hosted.tar.gz hosted - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file hosted.tar.gz "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/hosted/${VERSION}/hosted.tar.gz"' when: manual diff --git a/hosted/Dockerfile b/hosted/Dockerfile new file mode 100644 index 0000000..9317a1f --- /dev/null +++ b/hosted/Dockerfile @@ -0,0 +1,6 @@ +FROM ubuntu:18.04 + +WORKDIR /test +ADD . . + +RUN chmod a+x ./install.sh \ No newline at end of file diff --git a/hosted/README.md b/hosted/README.md new file mode 100644 index 0000000..540316e --- /dev/null +++ b/hosted/README.md @@ -0,0 +1,14 @@ +# hosted + +to test + +build +```bash +docker build . -t hosted:test -f Dockerfile +``` + +run + +```bash +docker run -ti -p 1812:1812/UDP -p 1813:1813/UDP hosted:test /bin/bash +``` \ No newline at end of file diff --git a/hosted/cron/radius-renew.sh b/hosted/cron/radius-renew.sh new file mode 100644 index 0000000..24ef0d2 --- /dev/null +++ b/hosted/cron/radius-renew.sh @@ -0,0 +1,2 @@ +#!/bin/bash +cd /etc/freeradius/certs/ && rm -rf *.pem ecc rsa && ./bootstrap && chown -R freerad:root * && service freeradius restart diff --git a/hosted/install.sh b/hosted/install.sh index abf94a6..664e803 100644 --- a/hosted/install.sh +++ b/hosted/install.sh @@ -81,11 +81,24 @@ echo "Fixing permissions..." chmod -R 750 $out_dir && chown -R freerad:root $out_dir ## Update systemd service -echo "Updating systemd service" -cp config/systemd/freeradius.service /lib/systemd/system/freeradius.service && chmod u+rw-x,go+r-wx /lib/systemd/system/freeradius.service && chown root: /lib/systemd/system/freeradius.service -systemctl daemon-reload +if [[ -d /run/systemd/system ]]; then + echo "Updating systemd service" + cp config/systemd/freeradius.service /lib/systemd/system/freeradius.service && chmod u+rw-x,go+r-wx /lib/systemd/system/freeradius.service && chown root: /lib/systemd/system/freeradius.service + systemctl daemon-reload -echo "Restarting server..." -service freeradius restart + echo "Restarting server..." + service freeradius restart +else + echo "Skipping systemd modify..." +fi + +## add crontab +if ! grep -q radius-renew.sh "/etc/crontab"; then + echo "Add crontab renew" + cp cron/radius-renew.sh /opt && chmod a+x /opt/radius-renew.sh && chown root: /opt/radius-renew.sh + echo "0 1 1 */1 * root bash /opt/radius-renew.sh" >> /etc/crontab +else + echo "Crontab already set" +fi echo "Freeradius installed!"