From 773dd1d06766baad8e9923ebcd684aad8d0bedd3 Mon Sep 17 00:00:00 2001 From: Igor Stegarescu Date: Fri, 26 Jan 2024 16:36:05 +0000 Subject: [PATCH 1/3] the data for fingerbank was moved to the main packetfence repo --- addons/dev-helpers/create-pf-git-storage.sh | 2 +- addons/dev-helpers/update-pf-git-storage.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/dev-helpers/create-pf-git-storage.sh b/addons/dev-helpers/create-pf-git-storage.sh index 531647eebd11..18860beb7d59 100644 --- a/addons/dev-helpers/create-pf-git-storage.sh +++ b/addons/dev-helpers/create-pf-git-storage.sh @@ -36,7 +36,7 @@ mkdir -p $dst_dir tmpdir=`mktemp -d` git clone -b $pf_ref https://github.com/inverse-inc/packetfence $tmpdir/packetfence -git clone -b $fb_ref https://github.com/fingerbank/perl-client $tmpdir/fingerbank +cp -a $tmpdir/packetfence/addons/perl-client/ $tmpdir/fingerbank ## Happens in the PF dir (chdir) cd $tmpdir/packetfence diff --git a/addons/dev-helpers/update-pf-git-storage.sh b/addons/dev-helpers/update-pf-git-storage.sh index 9dab30c23c56..cad9da3d1e3c 100644 --- a/addons/dev-helpers/update-pf-git-storage.sh +++ b/addons/dev-helpers/update-pf-git-storage.sh @@ -36,7 +36,7 @@ dst_dir=`echo $dst_dir | sed 's|/$||'` tmpdir=`mktemp -d` git clone -b $pf_ref https://github.com/inverse-inc/packetfence $tmpdir/packetfence -git clone -b $fb_ref https://github.com/fingerbank/perl-client $tmpdir/fingerbank +cp -a $tmpdir/packetfence/addons/perl-client/ $tmpdir/fingerbank cd $tmpdir/packetfence make configurations From 33a876102f9ec9cc8cc7099c21d145841ccbd912 Mon Sep 17 00:00:00 2001 From: Igor Stegarescu Date: Fri, 26 Jan 2024 17:00:38 +0000 Subject: [PATCH 2/3] 'fb_ref' is not used anymore --- addons/dev-helpers/create-pf-git-storage.sh | 7 ------- addons/dev-helpers/update-pf-git-storage.sh | 6 ------ 2 files changed, 13 deletions(-) diff --git a/addons/dev-helpers/create-pf-git-storage.sh b/addons/dev-helpers/create-pf-git-storage.sh index 18860beb7d59..b41889c2356d 100644 --- a/addons/dev-helpers/create-pf-git-storage.sh +++ b/addons/dev-helpers/create-pf-git-storage.sh @@ -14,7 +14,6 @@ function exit_usage() { dst_dir="$1" pf_ref="$2" -fb_ref="$3" if [ -z "$dst_dir" ]; then echo "!!! - Missing destination directory" @@ -26,11 +25,6 @@ if [ -z "$pf_ref" ]; then exit_usage fi -if [ -z "$fb_ref" ]; then - echo "!!! - Missing Fingerbank perl client repo branch or tag name" - exit_usage -fi - mkdir -p $dst_dir tmpdir=`mktemp -d` @@ -80,4 +74,3 @@ touch $dst_dir/fingerbank/conf/fingerbank.conf find $dst_dir -name .gitignore -delete chmod a+r -R $dst_dir - diff --git a/addons/dev-helpers/update-pf-git-storage.sh b/addons/dev-helpers/update-pf-git-storage.sh index cad9da3d1e3c..dbbfe22ad9d5 100644 --- a/addons/dev-helpers/update-pf-git-storage.sh +++ b/addons/dev-helpers/update-pf-git-storage.sh @@ -14,7 +14,6 @@ function exit_usage() { dst_dir="$1" pf_ref="$2" -fb_ref="$3" if [ -z "$dst_dir" ] || ! [ -d "$dst_dir" ]; then echo "!!! - Missing destination directory or it doesn't exist" @@ -26,11 +25,6 @@ if [ -z "$pf_ref" ]; then exit_usage fi -if [ -z "$fb_ref" ]; then - echo "!!! - Missing Fingerbank perl client repo branch or tag name" - exit_usage -fi - dst_dir=`echo $dst_dir | sed 's|/$||'` tmpdir=`mktemp -d` From 7ebd803305e499bf20a21c6351fdce4a4c894380 Mon Sep 17 00:00:00 2001 From: Igor Stegarescu Date: Wed, 14 Feb 2024 16:20:15 +0000 Subject: [PATCH 3/3] remove tmp directory for fingerbank --- addons/dev-helpers/create-pf-git-storage.sh | 5 ++--- addons/dev-helpers/update-pf-git-storage.sh | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/addons/dev-helpers/create-pf-git-storage.sh b/addons/dev-helpers/create-pf-git-storage.sh index b41889c2356d..d3d6e2ea4fc9 100644 --- a/addons/dev-helpers/create-pf-git-storage.sh +++ b/addons/dev-helpers/create-pf-git-storage.sh @@ -30,7 +30,6 @@ mkdir -p $dst_dir tmpdir=`mktemp -d` git clone -b $pf_ref https://github.com/inverse-inc/packetfence $tmpdir/packetfence -cp -a $tmpdir/packetfence/addons/perl-client/ $tmpdir/fingerbank ## Happens in the PF dir (chdir) cd $tmpdir/packetfence @@ -56,7 +55,7 @@ EOF cd - ## End of the commands in the PF dir -cd $tmpdir/fingerbank +cd $tmpdir/packetfence/addons/perl-client/ perl db/upgrade.pl --database=db/fingerbank_Local.db cp db/fingerbank_Local.db db/fingerbank_Upstream.db cd - @@ -68,7 +67,7 @@ mkdir -p $dst_dir/html/captive-portal/profile-templates/ touch $dst_dir/html/captive-portal/profile-templates/.empty mkdir -p $dst_dir/fingerbank -cp -a $tmpdir/fingerbank/conf $dst_dir/fingerbank/ +cp -a $tmpdir/packetfence/addons/perl-client/conf $dst_dir/fingerbank/ touch $dst_dir/fingerbank/conf/fingerbank.conf find $dst_dir -name .gitignore -delete diff --git a/addons/dev-helpers/update-pf-git-storage.sh b/addons/dev-helpers/update-pf-git-storage.sh index dbbfe22ad9d5..2ce539a195f0 100644 --- a/addons/dev-helpers/update-pf-git-storage.sh +++ b/addons/dev-helpers/update-pf-git-storage.sh @@ -30,7 +30,6 @@ dst_dir=`echo $dst_dir | sed 's|/$||'` tmpdir=`mktemp -d` git clone -b $pf_ref https://github.com/inverse-inc/packetfence $tmpdir/packetfence -cp -a $tmpdir/packetfence/addons/perl-client/ $tmpdir/fingerbank cd $tmpdir/packetfence make configurations @@ -61,7 +60,7 @@ ln -s ../sites-available/dynamic-clients dynamic-clients cd - mkdir -p $dst_dir/fingerbank -cp -a $tmpdir/fingerbank/conf $dst_dir/fingerbank/ +cp -a $tmpdir/packetfence/addons/perl-client/conf $dst_dir/fingerbank/ for file in $files; do file=`echo $file | sed 's|^/usr/local/pf/||'`