Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

the data for fingerbank was moved to the main packetfence repo #7994

Open
wants to merge 3 commits into
base: devel
Choose a base branch
from
Open

the data for fingerbank was moved to the main packetfence repo #7994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
773dd1d
the data for fingerbank was moved to the main packetfence repo
stegar123 Jan 26, 2024
33a8761
'fb_ref' is not used anymore
stegar123 Jan 26, 2024
7ebd803
remove tmp directory for fingerbank
stegar123 Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions addons/dev-helpers/create-pf-git-storage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -26,17 +25,11 @@ 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`

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

## Happens in the PF dir (chdir)
cd $tmpdir/packetfence
Expand All @@ -62,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 -
Expand All @@ -74,10 +67,9 @@ 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

chmod a+r -R $dst_dir

9 changes: 1 addition & 8 deletions addons/dev-helpers/update-pf-git-storage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -26,17 +25,11 @@ 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`

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

cd $tmpdir/packetfence
make configurations
Expand Down Expand Up @@ -67,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/||'`
Expand Down
Loading