pub/freeradius
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: update code

Browse Source
This commit is contained in:
Georg K
2025-06-19 04:37:54 +03:00
parent e14ae1bd1b
commit 00a1463461
9 changed files with 41 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
.gitlab-ci.yml
View File

@@ -1,10 +1,9 @@
variables: variables:
CI_REGISTRY: registry.connectone.pro CI_REGISTRY: registry.connectone.pro
CONTAINER_IMAGE: ${CI_REGISTRY}/${CI_PROJECT_PATH}:${CI_BUILD_REF_NAME}_${CI_BUILD_REF} CONTAINER_IMAGE: ${CI_REGISTRY}/${CI_PROJECT_PATH}:${CI_COMMIT_REF_NAME}_${CI_COMMIT_SHORT_SHA}
stages: stages:
- release - release
- deploy
- release-deb - release-deb
- release-hosted - release-hosted
@@ -12,12 +11,12 @@ release:
stage: release stage: release
image: docker:latest image: docker:latest
before_script: before_script:
- docker login -u gitlab-ci-token -p ${CI_BUILD_TOKEN} ${CI_REGISTRY} - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
script: script:
- docker build -t ${CONTAINER_IMAGE} . - docker build -t ${CONTAINER_IMAGE} .
- docker push ${CONTAINER_IMAGE} - docker push ${CONTAINER_IMAGE}
when: manual
only: only:
- develop
- main - main
release-deb: release-deb:
@@ -37,7 +36,7 @@ release-hosted:
stage: release-hosted stage: release-hosted
image: alpine:latest image: alpine:latest
variables: variables:
VERSION: "1.0.1" VERSION: "1.0.2"
script: script:
- apk add --no-cache curl - apk add --no-cache curl
- chmod a+x hosted/install.sh - chmod a+x hosted/install.sh
@@ -46,38 +45,3 @@ release-hosted:
when: manual when: manual
only: only:
- main - main
deploy-staging:
stage: deploy
image: jar3b/deploh:${STAGING_DEPLOYER_VERSION}
variables:
KUBECONFIG_BASE64: ${STAGING_KUBECONFIG}
KUBECONFIG_CONTEXT_NAME: ${STAGING_KUBECONFIG_CONTEXT}
NAMESPACE: ${STAGING_NAMESPACE}
MAIN_DOMAIN: ${STAGING_MAIN_DOMAIN}
STORAGE_BASE: ${STAGING_STORAGE_BASE}
script:
- he.sh . ${NAMESPACE} "freeradius" --set db.password=${PG_PROD_PASS}
environment:
name: staging
only:
- develop
deploy-production:
stage: deploy
image: jar3b/deploh:${PRODUCTION_DEPLOYER_VERSION}
variables:
KUBECONFIG_BASE64: ${PRODUCTION_KUBECONFIG}
KUBECONFIG_CONTEXT_NAME: ${PRODUCTION_KUBECONFIG_CONTEXT}
NAMESPACE: ${PRODUCTION_NAMESPACE}
MAIN_DOMAIN: ${PRODUCTION_MAIN_DOMAIN}
STORAGE_BASE: ${PRODUCTION_STORAGE_BASE}
script:
- he.sh . ${NAMESPACE} "freeradius" --set db.password=${PG_PROD_PASS}
environment:
name: production
when: manual
only:
- main

10
Dockerfile
View File

@@ -1,14 +1,14 @@
FROM ubuntu:18.04 FROM ubuntu:24.04
WORKDIR /tmp WORKDIR /tmp
ARG out_dir=/etc/freeradius ARG out_dir=/etc/freeradius
COPY local-bionic.list /etc/apt/sources.list COPY local-noble.list /etc/apt/sources.list.d/ubuntu.sources
RUN apt-get update && apt-get install -y apt-transport-https ca-certificates curl software-properties-common gpg RUN apt-get update && apt-get install -y apt-transport-https ca-certificates curl software-properties-common gpg
RUN curl -fsSL http://connectone.pro/gpg | gpg --dearmor -o /usr/share/keyrings/connectone.gpg && \ RUN curl -fsSL http://connectone.pro/gpg | gpg --dearmor -o /usr/share/keyrings/connectone.gpg && \
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/connectone.gpg] \ echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/connectone.gpg] \
https://nexus.connectone.pro/repository/radius bionic main" | tee /etc/apt/sources.list.d/connectone.list \ https://nexus.connectone.pro/repository/radius noble main" | tee /etc/apt/sources.list.d/connectone.list \
> /dev/null > /dev/null
RUN apt-get update && apt-get install -y libfreeradius3=3.2.2+git freeradius-common=3.2.2+git \ RUN apt-get update && apt-get install -y libfreeradius3=3.2.8+git freeradius-common=3.2.8+git \
freeradius-postgresql=3.2.2+git freeradius-rest=3.2.2+git freeradius-utils=3.2.2+git freeradius=3.2.2+git && \ freeradius-postgresql=3.2.8+git freeradius-rest=3.2.8+git freeradius-utils=3.2.8+git freeradius=3.2.8+git && \
apt autoremove --purge -y && apt-get clean apt autoremove --purge -y && apt-get clean
COPY hosted /tmp/hosted COPY hosted /tmp/hosted
RUN cp hosted/config/radiusd.conf $out_dir/radiusd.conf && \ RUN cp hosted/config/radiusd.conf $out_dir/radiusd.conf && \

4
build/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM ubuntu:18.04 FROM ubuntu:24.04
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ARG RADIUS_TAG="v3.2.x" ARG RADIUS_TAG="v3.2.x"
@@ -11,7 +11,7 @@ ENV RLM_RAW_TAG="master"
# Install build tools # Install build tools
# #
COPY local-bionic.list /etc/apt/sources.list COPY local-noble.list /etc/apt/sources.list.d/ubuntu.sources
RUN apt-get update && apt-get install -y devscripts equivs git quilt gcc RUN apt-get update && apt-get install -y devscripts equivs git quilt gcc

49
build/local-bionic.list
View File

@@ -1,49 +0,0 @@
# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
# newer versions of the distribution.
deb http://mirror.yandex.ru/ubuntu/ bionic main restricted
# deb-src http://mirror.yandex.ru/ubuntu/ bionic main restricted
## Major bug fix updates produced after the final release of the
## distribution.
deb http://mirror.yandex.ru/ubuntu/ bionic-updates main restricted
# deb-src http://mirror.yandex.ru/ubuntu/ bionic-updates main restricted
## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
## team. Also, please note that software in universe WILL NOT receive any
## review or updates from the Ubuntu security team.
deb http://mirror.yandex.ru/ubuntu/ bionic universe
# deb-src http://mirror.yandex.ru/ubuntu/ bionic universe
deb http://mirror.yandex.ru/ubuntu/ bionic-updates universe
# deb-src http://mirror.yandex.ru/ubuntu/ bionic-updates universe
## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
## team, and may not be under a free licence. Please satisfy yourself as to
## your rights to use the software. Also, please note that software in
## multiverse WILL NOT receive any review or updates from the Ubuntu
## security team.
deb http://mirror.yandex.ru/ubuntu/ bionic multiverse
# deb-src http://mirror.yandex.ru/ubuntu/ bionic multiverse
deb http://mirror.yandex.ru/ubuntu/ bionic-updates multiverse
# deb-src http://mirror.yandex.ru/ubuntu/ bionic-updates multiverse
## N.B. software from this repository may not have been tested as
## extensively as that contained in the main release, although it includes
## newer versions of some applications which may provide useful features.
## Also, please note that software in backports WILL NOT receive any review
## or updates from the Ubuntu security team.
deb http://mirror.yandex.ru/ubuntu/ bionic-backports main restricted universe multiverse
# deb-src http://mirror.yandex.ru/ubuntu/ bionic-backports main restricted universe multiverse
## Uncomment the following two lines to add software from Canonical's
## 'partner' repository.
## This software is not part of Ubuntu, but is offered by Canonical and the
## respective vendors as a service to Ubuntu users.
# deb http://archive.canonical.com/ubuntu bionic partner
# deb-src http://archive.canonical.com/ubuntu bionic partner
deb http://security.ubuntu.com/ubuntu/ bionic-security main restricted
# deb-src http://security.ubuntu.com/ubuntu/ bionic-security main restricted
deb http://security.ubuntu.com/ubuntu/ bionic-security universe
# deb-src http://security.ubuntu.com/ubuntu/ bionic-security universe
deb http://security.ubuntu.com/ubuntu/ bionic-security multiverse
# deb-src http://security.ubuntu.com/ubuntu/ bionic-security multiverse

13
build/local-noble.list Normal file
View File

@@ -0,0 +1,13 @@
Types: deb
URIs: http://ru.archive.ubuntu.com/ubuntu/
Suites: noble noble-updates noble-backports
Components: main universe restricted multiverse
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
## Ubuntu security updates. Aside from URIs and Suites,
## this should mirror your choices in the previous section.
Types: deb
URIs: http://ru.archive.ubuntu.com/ubuntu/
Suites: noble-security
Components: main universe restricted multiverse
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg

2
hosted/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM ubuntu:18.04 FROM ubuntu:24.04
WORKDIR /test WORKDIR /test
ADD . . ADD . .

6
hosted/install.sh
View File

@@ -16,10 +16,10 @@ apt-get install -y apt-transport-https ca-certificates curl software-properties-
echo "Installing freeradius..." echo "Installing freeradius..."
curl -fsSL http://connectone.pro/gpg | gpg --dearmor -o /usr/share/keyrings/connectone.gpg && \ curl -fsSL http://connectone.pro/gpg | gpg --dearmor -o /usr/share/keyrings/connectone.gpg && \
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/connectone.gpg] \ echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/connectone.gpg] \
https://nexus.connectone.pro/repository/radius bionic main" | tee /etc/apt/sources.list.d/connectone.list \ https://nexus.connectone.pro/repository/radius noble main" | tee /etc/apt/sources.list.d/connectone.list \
> /dev/null > /dev/null
apt-get update && apt-get install -y libfreeradius3=3.2.2+git freeradius-common=3.2.2+git \ apt-get update && apt-get install -y libfreeradius3=3.2.8+git freeradius-common=3.2.8+git \
freeradius-postgresql=3.2.2+git freeradius-rest=3.2.2+git freeradius-utils=3.2.2+git freeradius=3.2.2+git freeradius-postgresql=3.2.8+git freeradius-rest=3.2.8+git freeradius-utils=3.2.8+git freeradius=3.2.8+git
echo "Stopping service..." echo "Stopping service..."
service freeradius stop service freeradius stop

49
local-bionic.list
View File

@@ -1,49 +0,0 @@
# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
# newer versions of the distribution.
deb http://mirror.yandex.ru/ubuntu/ bionic main restricted
# deb-src http://mirror.yandex.ru/ubuntu/ bionic main restricted
## Major bug fix updates produced after the final release of the
## distribution.
deb http://mirror.yandex.ru/ubuntu/ bionic-updates main restricted
# deb-src http://mirror.yandex.ru/ubuntu/ bionic-updates main restricted
## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
## team. Also, please note that software in universe WILL NOT receive any
## review or updates from the Ubuntu security team.
deb http://mirror.yandex.ru/ubuntu/ bionic universe
# deb-src http://mirror.yandex.ru/ubuntu/ bionic universe
deb http://mirror.yandex.ru/ubuntu/ bionic-updates universe
# deb-src http://mirror.yandex.ru/ubuntu/ bionic-updates universe
## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
## team, and may not be under a free licence. Please satisfy yourself as to
## your rights to use the software. Also, please note that software in
## multiverse WILL NOT receive any review or updates from the Ubuntu
## security team.
deb http://mirror.yandex.ru/ubuntu/ bionic multiverse
# deb-src http://mirror.yandex.ru/ubuntu/ bionic multiverse
deb http://mirror.yandex.ru/ubuntu/ bionic-updates multiverse
# deb-src http://mirror.yandex.ru/ubuntu/ bionic-updates multiverse
## N.B. software from this repository may not have been tested as
## extensively as that contained in the main release, although it includes
## newer versions of some applications which may provide useful features.
## Also, please note that software in backports WILL NOT receive any review
## or updates from the Ubuntu security team.
deb http://mirror.yandex.ru/ubuntu/ bionic-backports main restricted universe multiverse
# deb-src http://mirror.yandex.ru/ubuntu/ bionic-backports main restricted universe multiverse
## Uncomment the following two lines to add software from Canonical's
## 'partner' repository.
## This software is not part of Ubuntu, but is offered by Canonical and the
## respective vendors as a service to Ubuntu users.
# deb http://archive.canonical.com/ubuntu bionic partner
# deb-src http://archive.canonical.com/ubuntu bionic partner
deb http://security.ubuntu.com/ubuntu/ bionic-security main restricted
# deb-src http://security.ubuntu.com/ubuntu/ bionic-security main restricted
deb http://security.ubuntu.com/ubuntu/ bionic-security universe
# deb-src http://security.ubuntu.com/ubuntu/ bionic-security universe
deb http://security.ubuntu.com/ubuntu/ bionic-security multiverse
# deb-src http://security.ubuntu.com/ubuntu/ bionic-security multiverse

13
local-noble.list Normal file
View File

@@ -0,0 +1,13 @@
Types: deb
URIs: http://ru.archive.ubuntu.com/ubuntu/
Suites: noble noble-updates noble-backports
Components: main universe restricted multiverse
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
## Ubuntu security updates. Aside from URIs and Suites,
## this should mirror your choices in the previous section.
Types: deb
URIs: http://ru.archive.ubuntu.com/ubuntu/
Suites: noble-security
Components: main universe restricted multiverse
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg