shared
/
mikrus-installer
2
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

More robust defoult NS config

Browse Source
profanity
Dominik Dzienia 2 years ago
parent 628405dfc4
commit 0e325bf140
6 changed files with 1603 additions and 1609 deletions
Show Stats Download Patch File Download Diff File

37
install.sh
Unescape Escape View File

@ -1,6 +1,6 @@
#!/bin/bash
### version: 1.4.0
### version: 1.5.0
# ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.#
# Nightscout Mikr.us setup script #
@ -33,8 +33,8 @@ MONGO_DB_DIR=/srv/nightscout/data/mongodb
TOOL_FILE=/srv/nightscout/tools/nightscout-tool
TOOL_LINK=/usr/bin/nightscout-tool
UPDATES_DIR=/srv/nightscout/updates
SCRIPT_VERSION="1.4.0" #auto-update
SCRIPT_BUILD_TIME="2023.09.04" #auto-update
SCRIPT_VERSION="1.5.0" #auto-update
SCRIPT_BUILD_TIME="2023.09.07" #auto-update
#=======================================
# SETUP
@ -281,9 +281,8 @@ multiline_length() {
local string=$1
local maxLen=0
# shellcheck disable=SC2059
readarray -t array <<< "$(printf "$string")"
for i in "${!array[@]}"
do
readarray -t array <<<"$(printf "$string")"
for i in "${!array[@]}"; do
local line=${array[i]}
lineLen=${#line}
if [ "$lineLen" -gt "$maxLen" ]; then
@ -304,9 +303,8 @@ center_multiline() {
local string=$1
# shellcheck disable=SC2059
readarray -t array <<< "$(printf "$string")"
for i in "${!array[@]}"
do
readarray -t array <<<"$(printf "$string")"
for i in "${!array[@]}"; do
local line=${array[i]}
# shellcheck disable=SC2005
echo "$(center_text "$line" "$maxLen")"
@ -475,23 +473,23 @@ setup_firewall() {
host=$(hostname)
host=${host:1}
port1=$((10000+host))
port2=$((20000+host))
port3=$((30000+host))
port1=$((10000 + host))
port2=$((20000 + host))
port3=$((30000 + host))
if ufw allow $port1 >>$LOGTO 2>&1 ; then
if ufw allow $port1 >>$LOGTO 2>&1; then
msgcheck "Do regul firewalla poprawnie dodano port $port1"
else
msgerr "Blad dodawania $port1 do regul firewalla"
fi
if ufw allow $port2 >>$LOGTO 2>&1 ; then
if ufw allow $port2 >>$LOGTO 2>&1; then
msgcheck "Do regul firewalla poprawnie dodano port $port2"
else
msgerr "Blad dodawania $port2 do regul firewalla"
fi
if ufw allow $port3 >>$LOGTO 2>&1 ; then
if ufw allow $port3 >>$LOGTO 2>&1; then
msgcheck "Do regul firewalla poprawnie dodano port $port3"
else
msgerr "Blad dodawania $port3 do regul firewalla"
@ -502,7 +500,7 @@ setup_firewall() {
setup_firewall_for_ns() {
ns_external_port=$(dotenv-tool -r get -f $ENV_FILE_DEP "NS_PORT")
if ufw allow "$ns_external_port" >>$LOGTO 2>&1 ; then
if ufw allow "$ns_external_port" >>$LOGTO 2>&1; then
msgcheck "Do regul firewalla poprawnie dodano port Nightscout: $ns_external_port"
else
msgerr "Blad dodawania portu Nightscout: $ns_external_port do reguł firewalla"
@ -703,7 +701,7 @@ update_if_needed() {
about_dialog() {
local msg="$(printf '\U1F9D1') (c) 2023 Dominik Dzienia\n$(printf '\U1F4E7') dominik.dzienia@gmail.com\n\n$(printf '\U1F3DB') To narzędzie jest dystrybuowane na licencji CC BY-NC-ND 4.0\nhttps://creativecommons.org/licenses/by-nc-nd/4.0/deed.pl\n\nwersja: $SCRIPT_VERSION ($SCRIPT_BUILD_TIME)"
local width=$(multiline_length "$msg")
whiptail --title "O tym narzędziu..." --msgbox "$(center_multiline "$msg" $((width+4)))" 13 $((width + 9))
whiptail --title "O tym narzędziu..." --msgbox "$(center_multiline "$msg" $((width + 4)))" 13 $((width + 9))
}
prompt_welcome() {
@ -941,8 +939,7 @@ version_menu() {
local ns_tag=$(dotenv-tool -r get -f $ENV_FILE_DEP "NS_NIGHTSCOUT_TAG")
local versions=()
while read -r line
do
while read -r line; do
if [ "$line" == "$ns_tag" ]; then
continue
fi
@ -959,7 +956,7 @@ version_menu() {
versions+=("$line")
versions+=("$label")
done <<< "$tags"
done <<<"$tags"
versions+=("M)")
versions+=(" Powrót do poprzedniego menu")

2
package.json
Unescape Escape View File

@ -1,6 +1,6 @@
{
"name": "@dlvoy/ns-installer-mikrus",
"version": "1.4.0",
"version": "1.5.0",
"description": "Nightscout installer for mikr.us VPS",
"main": "index.js",
"scripts": {

35
src/lib.sh
Unescape Escape View File

@ -17,8 +17,8 @@ MONGO_DB_DIR=/srv/nightscout/data/mongodb
TOOL_FILE=/srv/nightscout/tools/nightscout-tool
TOOL_LINK=/usr/bin/nightscout-tool
UPDATES_DIR=/srv/nightscout/updates
SCRIPT_VERSION="1.4.0" #auto-update
SCRIPT_BUILD_TIME="2023.09.04" #auto-update
SCRIPT_VERSION="1.5.0" #auto-update
SCRIPT_BUILD_TIME="2023.09.07" #auto-update
#=======================================
# SETUP
@ -265,9 +265,8 @@ multiline_length() {
local string=$1
local maxLen=0
# shellcheck disable=SC2059
readarray -t array <<< "$(printf "$string")"
for i in "${!array[@]}"
do
readarray -t array <<<"$(printf "$string")"
for i in "${!array[@]}"; do
local line=${array[i]}
lineLen=${#line}
if [ "$lineLen" -gt "$maxLen" ]; then
@ -288,9 +287,8 @@ center_multiline() {
local string=$1
# shellcheck disable=SC2059
readarray -t array <<< "$(printf "$string")"
for i in "${!array[@]}"
do
readarray -t array <<<"$(printf "$string")"
for i in "${!array[@]}"; do
local line=${array[i]}
# shellcheck disable=SC2005
echo "$(center_text "$line" "$maxLen")"
@ -459,23 +457,23 @@ setup_firewall() {
host=$(hostname)
host=${host:1}
port1=$((10000+host))
port2=$((20000+host))
port3=$((30000+host))
port1=$((10000 + host))
port2=$((20000 + host))
port3=$((30000 + host))
if ufw allow $port1 >>$LOGTO 2>&1 ; then
if ufw allow $port1 >>$LOGTO 2>&1; then
msgcheck "Do regul firewalla poprawnie dodano port $port1"
else
msgerr "Blad dodawania $port1 do regul firewalla"
fi
if ufw allow $port2 >>$LOGTO 2>&1 ; then
if ufw allow $port2 >>$LOGTO 2>&1; then
msgcheck "Do regul firewalla poprawnie dodano port $port2"
else
msgerr "Blad dodawania $port2 do regul firewalla"
fi
if ufw allow $port3 >>$LOGTO 2>&1 ; then
if ufw allow $port3 >>$LOGTO 2>&1; then
msgcheck "Do regul firewalla poprawnie dodano port $port3"
else
msgerr "Blad dodawania $port3 do regul firewalla"
@ -486,7 +484,7 @@ setup_firewall() {
setup_firewall_for_ns() {
ns_external_port=$(dotenv-tool -r get -f $ENV_FILE_DEP "NS_PORT")
if ufw allow "$ns_external_port" >>$LOGTO 2>&1 ; then
if ufw allow "$ns_external_port" >>$LOGTO 2>&1; then
msgcheck "Do regul firewalla poprawnie dodano port Nightscout: $ns_external_port"
else
msgerr "Blad dodawania portu Nightscout: $ns_external_port do reguł firewalla"
@ -687,7 +685,7 @@ update_if_needed() {
about_dialog() {
local msg="$(printf '\U1F9D1') (c) 2023 Dominik Dzienia\n$(printf '\U1F4E7') dominik.dzienia@gmail.com\n\n$(printf '\U1F3DB') To narzędzie jest dystrybuowane na licencji CC BY-NC-ND 4.0\nhttps://creativecommons.org/licenses/by-nc-nd/4.0/deed.pl\n\nwersja: $SCRIPT_VERSION ($SCRIPT_BUILD_TIME)"
local width=$(multiline_length "$msg")
whiptail --title "O tym narzędziu..." --msgbox "$(center_multiline "$msg" $((width+4)))" 13 $((width + 9))
whiptail --title "O tym narzędziu..." --msgbox "$(center_multiline "$msg" $((width + 4)))" 13 $((width + 9))
}
prompt_welcome() {
@ -925,8 +923,7 @@ version_menu() {
local ns_tag=$(dotenv-tool -r get -f $ENV_FILE_DEP "NS_NIGHTSCOUT_TAG")
local versions=()
while read -r line
do
while read -r line; do
if [ "$line" == "$ns_tag" ]; then
continue
fi
@ -943,7 +940,7 @@ version_menu() {
versions+=("$line")
versions+=("$label")
done <<< "$tags"
done <<<"$tags"
versions+=("M)")
versions+=(" Powrót do poprzedniego menu")

2
src/setup.sh
Unescape Escape View File

@ -1,6 +1,6 @@
#!/bin/bash
### version: 1.4.0
### version: 1.5.0
# ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.#
# Nightscout Mikr.us setup script #

74
templates/nightscout.env
Unescape Escape View File

@ -46,48 +46,48 @@ BRIDGE_SERVER="EU" # ZMIEŃ WPIS NA "US" JEŚLI KORZYSTASZ BEZPOŚREDNIO Z ODCZ
# Ustawienia alarmów
########################################
ALARM_HIGH = "off"
ALARM_LOW = "off"
ALARM_TIMEAGO_URGENT = "off"
ALARM_TIMEAGO_URGENT_MINS = 30
ALARM_TIMEAGO_WARN = "off"
ALARM_TIMEAGO_WARN_MINS = 15
ALARM_TYPES = "simple"
ALARM_URGENT_HIGH = "off"
ALARM_URGENT_LOW = "off"
ALARM_HIGH="off"
ALARM_LOW="off"
ALARM_TIMEAGO_URGENT="off"
ALARM_TIMEAGO_URGENT_MINS=30
ALARM_TIMEAGO_WARN="off"
ALARM_TIMEAGO_WARN_MINS=15
ALARM_TYPES="simple"
ALARM_URGENT_HIGH="off"
ALARM_URGENT_LOW="off"
########################################
# Ustawienia wyświetlania
########################################
BAGE_DISPLAY = "days"
BAGE_URGENT = 624
BAGE_WARN = 432
CAGE_DISPLAY = "days"
CAGE_URGENT = 84
CAGE_WARN = 72
IAGE_URGENT = 168
IAGE_WARN = 144
SAGE_URGENT = 216
SAGE_WARN = 192
UPBAT_URGENT = 20
UPBAT_WARN = 30
PUMP_URGENT_BATT_P = 26
PUMP_URGENT_BATT_V = 1.3
PUMP_URGENT_CLOCK = 30
PUMP_URGENT_RES = 10
PUMP_WARN_BATT_P = 51
SCALE_Y = "linear"
SHOW_CLOCK_DELTA = "true"
SHOW_CLOCK_LAST_TIME = "true"
BG_HIGH = 250
BG_LOW = 55
BG_TARGET_BOTTOM = 70
BG_TARGET_TOP = 180
BOLUS_RENDER_OVER = 0.1
BAGE_DISPLAY="days"
BAGE_URGENT=624
BAGE_WARN=432
CAGE_DISPLAY="days"
CAGE_URGENT=84
CAGE_WARN=72
IAGE_URGENT=168
IAGE_WARN=144
SAGE_URGENT=216
SAGE_WARN=192
UPBAT_URGENT=20
UPBAT_WARN=30
PUMP_URGENT_BATT_P=26
PUMP_URGENT_BATT_V=1.3
PUMP_URGENT_CLOCK=30
PUMP_URGENT_RES=10
PUMP_WARN_BATT_P=51
SCALE_Y="linear"
SHOW_CLOCK_DELTA="true"
SHOW_CLOCK_LAST_TIME="true"
BG_HIGH=250
BG_LOW=55
BG_TARGET_BOTTOM=70
BG_TARGET_TOP=180
BOLUS_RENDER_OVER=0.1
########################################
# Konfiguracja bezpieczeństwa

2
updated
Unescape Escape View File

@ -1 +1 @@
2023-09-04T21:02:09.851Z
2023-09-07T21:38:38.332Z
Write Preview
Loading…
Cancel
Save