wanderer/fastnetmon-rewritten
1
0
Fork 0
mirror of https://github.com/pavel-odintsov/fastnetmon synced 2024-11-26 13:14:31 +01:00
Code Issues Releases Activity

Switched FastNetMon binaries to new folder

Browse Source
This commit is contained in:
Pavel Odintsov 2022-06-03 10:09:58 +01:00
parent 876d809109
commit 7df6439cc2
2 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.circleci/config.yml
View File

@ -142,10 +142,10 @@ jobs:
path: /tmp/fastnetmon_<< pipeline.parameters.fastnetmon_build_version >>_amd64.deb
- run: s3cmd --disable-multipart --host=storage.googleapis.com --host-bucket="%(bucket).storage.googleapis.com" put /tmp/fastnetmon_<< pipeline.parameters.fastnetmon_build_version >>_amd64.deb s3://fastnetmon_community_packages/<< pipeline.parameters.fastnetmon_build_version >>/ubuntu/<< parameters.ubuntu_version >>/fastnetmon_<< pipeline.parameters.fastnetmon_build_version >>_amd64.deb
- run: cp src/fastnetmon.conf /etc/fastnetmon.conf
- run: ldd /opt/fastnetmon/fastnetmon
- run: ldd /opt/fastnetmon/fastnetmon_client
- run: ldd /opt/fastnetmon/fastnetmon_api_client
- run: /opt/fastnetmon/fastnetmon --configuration_check
- run: ldd /opt/fastnetmon-community/fastnetmon
- run: ldd /opt/fastnetmon-community/fastnetmon_client
- run: ldd /opt/fastnetmon-community/fastnetmon_api_client
- run: /opt/fastnetmon-community/fastnetmon --configuration_check
build_debian:
parameters:
docker_image:
@ -201,9 +201,9 @@ jobs:
path: /tmp/fastnetmon_<< pipeline.parameters.fastnetmon_build_version >>_amd64.deb
- run: s3cmd --disable-multipart --host=storage.googleapis.com --host-bucket="%(bucket).storage.googleapis.com" put /tmp/fastnetmon_<< pipeline.parameters.fastnetmon_build_version >>_amd64.deb s3://fastnetmon_community_packages/<< pipeline.parameters.fastnetmon_build_version >>/debian/<< parameters.debian_version >>/fastnetmon_<< pipeline.parameters.fastnetmon_build_version >>_amd64.deb
- run: cp src/fastnetmon.conf /etc/fastnetmon.conf
- run: ldd /opt/fastnetmon/fastnetmon
- run: ldd /opt/fastnetmon/fastnetmon_client
- run: ldd /opt/fastnetmon/fastnetmon_api_client
- run: /opt/fastnetmon-community/fastnetmon
- run: /opt/fastnetmon-community/fastnetmon_client
- run: /opt/fastnetmon-community/fastnetmon_api_client
build_centos:
parameters:
docker_image:
@ -258,10 +258,10 @@ jobs:
path: /tmp/result_data/fastnetmon-<< pipeline.parameters.fastnetmon_build_version >>-1.el<< parameters.centos_version >>.x86_64.rpm
- run: s3cmd --disable-multipart --host=storage.googleapis.com --host-bucket="%(bucket).storage.googleapis.com" put /tmp/result_data/fastnetmon-<< pipeline.parameters.fastnetmon_build_version >>-1.el<< parameters.centos_version >>.x86_64.rpm s3://fastnetmon_community_packages/<< pipeline.parameters.fastnetmon_build_version >>/centos/<< parameters.centos_version >>/fastnetmon-<< pipeline.parameters.fastnetmon_build_version >>-1.el<< parameters.centos_version >>.x86_64.rpm
- run: cp src/fastnetmon.conf /etc/fastnetmon.conf
- run: ldd /opt/fastnetmon/fastnetmon
- run: ldd /opt/fastnetmon/fastnetmon_client
- run: ldd /opt/fastnetmon/fastnetmon_api_client
- run: /opt/fastnetmon/fastnetmon --configuration_check
- run: ldd /opt/fastnetmon-community/fastnetmon
- run: ldd /opt/fastnetmon-community/fastnetmon_client
- run: ldd /opt/fastnetmon-community/fastnetmon_api_client
- run: /opt/fastnetmon-community/fastnetmon --configuration_check
workflows:
version: 2
all_distros:

22
src/scripts/fastnetmon_build.pl
View File

@ -26,7 +26,8 @@ BEGIN {
}
}
my $library_install_folder = '/opt/fastnetmon-community/libraries';
my $fastnetmon_install_folder = '/opt/fastnetmon-community';
my $library_install_folder = "$fastnetmon_install_folder/libraries";
my $we_use_code_from_master = '';
my $ld_library_path_for_make = "";
@ -1578,22 +1579,18 @@ sub install_fastnetmon {
system("$ld_library_path_for_make make $make_options >> $install_log_path 2>&1");
}
my $fastnetmon_dir = "$library_install_folder/fastnetmon";
my $fastnetmon_build_binary_path = "$fastnetmon_code_dir/build/fastnetmon";
unless (-e $fastnetmon_build_binary_path) {
fast_die("Can't build fastnetmon!");
}
mkdir $fastnetmon_dir;
mkdir $fastnetmon_install_folder;
print "Install fastnetmon to dir $fastnetmon_dir\n";
exec_command("cp $fastnetmon_build_binary_path $fastnetmon_dir/fastnetmon");
exec_command("cp $fastnetmon_code_dir/build/fastnetmon_client $fastnetmon_dir/fastnetmon_client");
if (-e "$fastnetmon_code_dir/build/fastnetmon_api_client") {
exec_command("cp $fastnetmon_code_dir/build/fastnetmon_api_client $fastnetmon_dir/fastnetmon_api_client");
}
print "Install fastnetmon to directory $fastnetmon_install_folder\n";
exec_command("cp $fastnetmon_build_binary_path $fastnetmon_install_folder/fastnetmon");
exec_command("cp $fastnetmon_code_dir/build/fastnetmon_client $fastnetmon_install_folder/fastnetmon_client");
exec_command("cp $fastnetmon_code_dir/build/fastnetmon_api_client $fastnetmon_install_folder/fastnetmon_api_client");
my $fastnetmon_config_path = "/etc/fastnetmon.conf";
unless (-e $fastnetmon_config_path) {
@ -1601,14 +1598,11 @@ sub install_fastnetmon {
exec_command("cp $fastnetmon_code_dir/fastnetmon.conf $fastnetmon_config_path");
}
print "If you have any issues, please check /var/log/fastnetmon.log file contents\n";
print "Please add your subnets in /etc/networks_list in CIDR format one subnet per line\n";
my $init_script_result = install_init_scripts();
# Print unified run message
unless ($init_script_result) {
print "You can run fastnetmon with command: $fastnetmon_dir/fastnetmon\n";
print "You can run fastnetmon with command: $fastnetmon_install_folder/fastnetmon\n";
}
}