fix: hosted files

.gitlab-ci.yml

@@ -39,7 +39,7 @@ release-hosted:
     VERSION: "1.0.3"
   script:
     - apk add --no-cache curl
-    - chmod a+x hosted/install.sh
+    - chmod a+x hosted/install.sh hosted/update.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

hosted/install.sh

@@ -7,6 +7,9 @@ if [ "$EUID" -ne 0 ]; then
   exit
 fi
 
+source .env
+source .env_cnf
+
 out_dir=/etc/freeradius
 
 echo "Installing packages..."
@@ -19,7 +22,9 @@ curl -fsSL http://connectone.pro/gpg | gpg --dearmor -o /usr/share/keyrings/conn
     https://nexus.connectone.pro/repository/radius bionic main" | tee /etc/apt/sources.list.d/connectone.list \
     > /dev/null
 apt-get update && apt-get install -y libfreeradius3=${FREERADIUS_TAG}+git freeradius-common=${FREERADIUS_TAG}+git \
-    freeradius-postgresql=${FREERADIUS_TAG}+git freeradius-rest=${FREERADIUS_TAG}+git freeradius-utils=${FREERADIUS_TAG}+git freeradius=${FREERADIUS_TAG}+git
+    freeradius-postgresql=${FREERADIUS_TAG}+git freeradius-rest=${FREERADIUS_TAG}+git \
+    freeradius-utils=${FREERADIUS_TAG}+git freeradius=${FREERADIUS_TAG}+git
+apt-mark hold libfreeradius3 freeradius-common freeradius-postgresql freeradius-rest freeradius-utils freeradius
 
 echo "Stopping service..."
 service freeradius stop
@@ -27,39 +32,10 @@ service freeradius stop
 echo "Chowning..."
 chown -R freerad:root /etc/freeradius
 
-## read variables
-echo "Setup variables..."
-
-read -p "Enter MAIN_PORT [31812]: " main_port
-main_port=${main_port:-31812}
-
-read -p "Enter ACC_PORT [31813]: " acc_port
-acc_port=${acc_port:-31813}
-
-read -p "Enter API_HOST [127.0.0.1]: " api_host
-api_host=${api_host:-127.0.0.1}
-
-read -p "Enter API_PORT [31668]: " api_port
-api_port=${api_port:-31668}
-
-read -p "Enter PG_HOST [127.0.0.1]: " pg_host
-pg_host=${pg_host:-127.0.0.1}
-
-read -p "Enter PG_PORT [32206]: " pg_port
-pg_port=${pg_port:-32206}
-
-read -p "Enter PG_USER [admin]: " pg_user
-pg_user=${pg_user:-admin}
-
-read -p "Enter PG_PASS: " pg_pass
-
-read -p "Enter PG_DB [radius_db]: " pg_db
-pg_db=${pg_db:-radius_db}
-
 ## write configs
-sed -e "s/#MAIN_PORT#/$main_port/" -e "s/#ACC_PORT#/$acc_port/" config/sites-enabled/default >$out_dir/sites-enabled/default
+sed -e "s/#MAIN_PORT#/${FR_MAIN_PORT}/" -e "s/#ACC_PORT#/${FR_ACC_PORT}/" config/sites-enabled/default >$out_dir/sites-enabled/default
-sed -e "s/#API_HOST#/$api_host/" -e "s/#API_PORT#/$api_port/" config/mods-enabled/rest >$out_dir/mods-enabled/rest
+sed -e "s/#API_HOST#/${FR_API_HOST}/" -e "s/#API_PORT#/${FR_API_PORT}/" config/mods-enabled/rest >$out_dir/mods-enabled/rest
-sed -e "s/#PG_HOST#/$pg_host/" -e "s/#PG_PORT#/$pg_port/" -e "s/#PG_USER#/$pg_user/" -e "s/#PG_PASS#/$pg_pass/" -e "s/#PG_DB#/$pg_db/" config/mods-enabled/sql >$out_dir/mods-enabled/sql
+sed -e "s/#PG_HOST#/${FR_PG_HOST}/" -e "s/#PG_PORT#/${FR_PG_PORT}/" -e "s/#PG_USER#/${FR_PG_USER}/" -e "s/#PG_PASS#/${FR_PG_PASS}/" -e "s/#PG_DB#/${FR_PG_DB}/" config/mods-enabled/sql >$out_dir/mods-enabled/sql
 
 ## copy dict
 echo "Copy unmodified configs"

hosted/update.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+if [ "$EUID" -ne 0 ]; then
+  echo "Please run as root"
+  exit
+fi
+
+source .env
+
+echo "Stopping service..."
+service freeradius stop
+
+apt-mark unhold libfreeradius3 freeradius-common freeradius-postgresql freeradius-rest freeradius-utils freeradius
+apt-get update && apt-get install -y libfreeradius3=${FREERADIUS_TAG}+git freeradius-common=${FREERADIUS_TAG}+git \
+    freeradius-postgresql=${FREERADIUS_TAG}+git freeradius-rest=${FREERADIUS_TAG}+git \
+    freeradius-utils=${FREERADIUS_TAG}+git freeradius=${FREERADIUS_TAG}+git
+apt-mark hold libfreeradius3 freeradius-common freeradius-postgresql freeradius-rest freeradius-utils freeradius
+
+echo "Restarting server..."
+service freeradius start