Skip to content

no official fixes #44

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

Open
WojRep wants to merge 5 commits into
base: master
Choose a base branch
from
Open

no official fixes #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cdd8b95
Update silkonabox.sh
WojRep Jul 28, 2021
9e56308
Delete install_flowbat_centos6.sh
WojRep Jul 28, 2021
9d33e20
Update install_flowbat_ubuntu.sh
WojRep Jul 28, 2021
bb02f35
Update package.json
WojRep Jul 28, 2021
76c3444
Update layout.html.jade
WojRep Jul 28, 2021
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
7 changes: 5 additions & 2 deletions client/templates/layout/layout.html.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
head
meta(name="viewport" content="width=device-width, initial-scale=1")
link(rel="icon" href="/favicon.ico")
script(type='text/javascript' src='https://www.google.com/jsapi?autoload={"modules":[{"name":"visualization","version":"1","packages":["corechart"]}]}]}')

script(src='https://www.gstatic.com/charts/loader.js')
script
| google.charts.load('current', {packages: ['corechart']})
| google.charts.setOnLoadCallback(drawChart)

template(name="layout")
if currentUser
+yield(region="header")
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
},
"dependencies": {
"babel-runtime": "^6.26.0",
"bcrypt": "^0.8.7"
"bcrypt-nodejs": ""
}
}
142 changes: 0 additions & 142 deletions support/install_flowbat_centos6.sh
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion support/install_flowbat_ubuntu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ fi
sudo apt-get install -y curl build-essential git unzip

# Clone the FlowBAT repo
git clone https://github.com/chrissanders/FlowBAT.git
git clone https://github.com/WojRep/FlowBAT.git

# Install meteor and build package. Removes any existing bundle folders.
curl https://install.meteor.com/ | sh
Expand Down
5 changes: 2 additions & 3 deletions support/silkonabox.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,8 @@ EOF

fi

## Download country code database - These can be updated as needed via the commands below
wget http://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip
unzip GeoIPCountryCSV.zip ; cat GeoIPCountryWhois.csv | rwgeoip2ccmap --csv-input > country_codes.pmap
## Download country code database manual !!!
cat GeoIPCountryWhois.csv | rwgeoip2ccmap --csv-input > country_codes.pmap
sudo mv country_codes.pmap /usr/local/share/silk/

# Start up services
Expand Down