CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

[fix] Don't overwrite daemon.json, and only accept turbo mode on correct install types

Browse Source
This commit is contained in:
William Wernert
2020-05-22 14:36:55 -04:00
parent 78f6261fcc
commit 579b622935
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
setup/so-functions
View File

@@ -616,9 +616,10 @@ docker_registry() {
echo "Setting up Docker Registry" >> "$setup_log" 2>&1 echo "Setting up Docker Registry" >> "$setup_log" 2>&1
mkdir -p /etc/docker >> "$setup_log" 2>&1 mkdir -p /etc/docker >> "$setup_log" 2>&1
# Make the host use the master docker registry # Make the host use the master docker registry
if [ -n "$TURBO" ]; then local proxy="$TURBO"; else local proxy="$MSRV"; fi
printf '%s\n'\ printf '%s\n'\
"{"\ "{"\
" \"registry-mirrors\": [\"https://$MSRV:5000\"]"\ " \"registry-mirrors\": [\"https://$proxy:5000\"]"\
"}" > /etc/docker/daemon.json "}" > /etc/docker/daemon.json
echo "Docker Registry Setup - Complete" >> "$setup_log" 2>&1 echo "Docker Registry Setup - Complete" >> "$setup_log" 2>&1
@@ -951,9 +952,15 @@ node_pillar() {
parse_options() { parse_options() {
case "$1" in case "$1" in
--turbo=*) --turbo=*)
if [[ $is_master || $is_helix ]]; then
local proxy local proxy
proxy=$(echo "$1" | awk -F'--turbo=' '{print $2}') proxy=$(echo "$1" | awk -F'--turbo=' '{print $2}')
use_proxy "http://$proxy" proxy_addr="http://$proxy"
use_proxy "$proxy_addr"
TURBO="$proxy_addr"
else
echo "turbo is not supported on this install type" >> $setup_log 2>&1
fi
;; ;;
--proxy=*) --proxy=*)
echo "Unimplimented" echo "Unimplimented"
@@ -963,13 +970,13 @@ parse_options() {
echo "Invalid options passed for proxy. Order is --proxy-user=<user> --proxy-pass=<password>" echo "Invalid options passed for proxy. Order is --proxy-user=<user> --proxy-pass=<password>"
else else
local proxy local proxy
local user local proxy_user
local password local proxy_password
proxy=$(echo "$1" | awk -F'--proxy=' '{print $2}') proxy=$(echo "$1" | awk -F'--proxy=' '{print $2}')
user=$(echo "$2" | awk -F'--proxy-user=' '{print $2}') proxy_user=$(echo "$2" | awk -F'--proxy-user=' '{print $2}')
password=$(echo "$3" | awk -F'--proxy-pass=' '{print $2}') proxy_password=$(echo "$3" | awk -F'--proxy-pass=' '{print $2}')
use_proxy "$proxy" "$user" "$password" use_proxy "$proxy" "$proxy_user" "$proxy_password"
fi fi
;; ;;
*) *)
@@ -1478,18 +1485,14 @@ use_proxy() {
if [[ $OS == 'centos' ]]; then if [[ $OS == 'centos' ]]; then
printf '%s\n'\ printf '%s\n'\
"proxy=$proxy_addr:3142" >> /etc/yum.conf "proxy=${proxy_addr}:3142" >> /etc/yum.conf
else else
printf '%s\n'\ printf '%s\n'\
"Acquire {"\ "Acquire {"\
"HTTP::proxy \"$proxy_addr:3142\";"\ "HTTP::proxy \"${proxy_addr}:3142\";"\
"HTTPS::proxy \"$proxy_addr:3142\";"\ "HTTPS::proxy \"${proxy_addr}:3142\";"\
"}" > /etc/apt/apt.conf.d/proxy.conf "}" > /etc/apt/apt.conf.d/proxy.conf
fi fi
printf '%s\n'\
"{"\
" \"registry-mirrors\": [\"$proxy_addr:5000\"]"\
"}" > /etc/docker/daemon.json
} }
ls_heapsize() { ls_heapsize() {