From c5542d929aa1abf82671f9bcfa4d8e66754ce9e8 Mon Sep 17 00:00:00 2001
From: Jan Grewe <jan@faked.org>
Date: Tue, 28 May 2024 23:45:33 +0200
Subject: [PATCH] use OpenWISP shared secret from CI/CD variables
---
.gitlab-ci.yml | 2 ++
files/etc/config/openwisp | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 633f4c1..535478b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,7 @@ variables:
REMOVE_PACKAGES: dnsmasq odhcpd-ipv6only wpad-basic-mbedtls
DISABLED_SERVICES: firewall
EXTRA_IMAGE_NAME: fakedOrg
+ #OPENWISP_SHARED_SECRET: <from-ci-variables>
.build_image:
stage: build
@@ -21,6 +22,7 @@ variables:
- cd /builder
script:
- export REMOVE_PACKAGES=$(for package in ${REMOVE_PACKAGES}; do echo -n "-${package} "; done)
+ - sed -i "s/%OPENWISP_SHARED_SECRET%/${OPENWISP_SHARED_SECRET}/" ${FILES}/etc/config/openwisp
- make image PROFILE=${PROFILE} FILES=${FILES} PACKAGES="${DEFAULT_PACKAGES} ${EXTRA_PACKAGES} ${REMOVE_PACKAGES}"
after_script:
- if [[ -d /builder/bin ]]; then mv /builder/bin .; fi
diff --git a/files/etc/config/openwisp b/files/etc/config/openwisp
index 0787433..9352416 100644
--- a/files/etc/config/openwisp
+++ b/files/etc/config/openwisp
@@ -1,7 +1,6 @@
config controller 'http'
option url 'https://openwisp.faked.org'
- option shared_secret 'fSIRdSdsqoKYhCYovE1zareJhkOKMtcL'
+ option shared_secret '%OPENWISP_SHARED_SECRET%'
option default_hostname 'openwrt'
option mac_interface 'br-lan'
option management_interface 'br-lan'
- option verify_ssl '0'
--
GitLab