git.iko.soy/xmrig-bash-scripts
on master help sign in
Merge branch 'release/v1.0.9'
fcbe6d6Sean Wheller
crontab.sh+1−1
compare with master
unifiedsplit
@@ -12,7 +12,7 @@ crontab -r
12
12
13# Setup users contab
13# Setup users contab
14
14
15−crontab -l | { cat; echo "#Start at $_USER_TIMESTART on days $_USER_CRONDAYS
15+crontab -l | { cat; echo "#Start at $_USER_CRONSTART on days $_USER_CRONDAYS
160 $_USER_CRONSTART * * $_USER_CRONDAYS screen -dmS $_XMRIG_SCREEN xmrig --config=$_XMRIG_CONFIG_LOCATION"; } | crontab -
160 $_USER_CRONSTART * * $_USER_CRONDAYS screen -dmS $_XMRIG_SCREEN xmrig --config=$_XMRIG_CONFIG_LOCATION"; } | crontab -
17
17
18crontab -l | { cat; echo "#Stop at $_USER_TIMESTOP on days $_USER_CRONDAYS
18crontab -l | { cat; echo "#Stop at $_USER_TIMESTOP on days $_USER_CRONDAYS
functions.sh+3−1
@@ -37,7 +37,9 @@ function load_mysettings () {
37}
37}
38
38
39function my_config_json () {
39function my_config_json () {
40+
40− _CONFIG_JSON=$(jo -p -B api=$(jo id=$_API_ID worker-id=$_API_WORKER_ID) autosave=$_AUTOSAVE background=$_BACKGROUND colors=$_COLORS cpu=$(jo enabled=$_CPU_ENABLED huge-pages=$_CPU_HUGE_PAGES hw-aes=$_CPU_HW_AES priority=$_CPU_PRIORITY asm=$_CPU_ASM cn=$(jo -a $_CPU_CN) cn/0=$_CPU_CN_0 cn-lite/0=$_CPU_CN_LITE_0) donate-level=$_DONATE_LEVEL donate-over-proxy=$_DONATE_OVER_PROXY http=$(jo enabled=$_HTTP_ENABLED host=$_HTTP_HOST port=$_HTTP_PORT access-token=$_HTTP_ACCESS_TOKEN restricted=$_HTTP_RESTRICTED) log-file=$_LOG_FILE pools=$(jo -a $(jo algo=$_POOLS_ALGO url=$_POOLS_URL user=$_POOLS_USER pass=$_POOLS_PASS rig-id=$_POOLS_RIG_ID nicehash=$_POOLS_NICEHASH keepalive=$_POOLS_KEEPALIVE enabled=$_POOLS_ENABLED tls=$_POOLS_TLS tls-fingerprint=$_POOLS_TLS_FINDERPRINT daemon=$_POOLS_DAEMON)) print-time=$_PRINT_TIME retries=$_RETRIES retry-pause=$_RETRIES_PAUSE syslog=$_SYSLOG user-agent=$_USER_AGENT watch=$_WATCH)
41+ _CONFIG_JSON=$(jo -p -B api=$(jo id=$_API_ID worker-id=$_API_WORKER_ID) autosave=$_AUTOSAVE background=$_BACKGROUND colors=$_COLORS cpu=$(jo enabled=$_CPU_ENABLED huge-pages=$_CPU_HUGE_PAGES hw-aes=$_CPU_HW_AES priority=$_CPU_PRIORITY asm=$_CPU_ASM cn=$(jo -a $_CPU_CN) cn/0=$_CPU_CN_0 cn-lite/0=$_CPU_CN_LITE_0) opencl=$(jo enabled=$_OPENCL_ENABLED cache=$_OPENCL_CACHE loader=$_OPENCL_LOADER platform=$_OPENCL_PLATFORM) donate-level=$_DONATE_LEVEL donate-over-proxy=$_DONATE_OVER_PROXY http=$(jo enabled=$_HTTP_ENABLED host=$_HTTP_HOST port=$_HTTP_PORT access-token=$_HTTP_ACCESS_TOKEN restricted=$_HTTP_RESTRICTED) log-file=$_LOG_FILE pools=$(jo -a $(jo algo=$_POOLS_ALGO url=$_POOLS_URL user=$_POOLS_USER pass=$_POOLS_PASS rig-id=$_POOLS_RIG_ID nicehash=$_POOLS_NICEHASH keepalive=$_POOLS_KEEPALIVE enabled=$_POOLS_ENABLED tls=$_POOLS_TLS tls-fingerprint=$_POOLS_TLS_FINDERPRINT daemon=$_POOLS_DAEMON)) print-time=$_PRINT_TIME retries=$_RETRIES retry-pause=$_RETRIES_PAUSE syslog=$_SYSLOG user-agent=$_USER_AGENT watch=$_WATCH)
42+
41}
43}
42
44
43function build_xmrig () {
45function build_xmrig () {
settings.sh+12−7
@@ -16,7 +16,7 @@ show_settings
16# DO NOT CHANGE AFTER THIS POINT UNLESS YOU KNOW WHAT YOU ARE DOING #
16# DO NOT CHANGE AFTER THIS POINT UNLESS YOU KNOW WHAT YOU ARE DOING #
17#######################################################################
17#######################################################################
18
18
19−_API_ID="null"
19+_API_ID='null'
20_API_WORKER_ID="$HOSTNAME"
20_API_WORKER_ID="$HOSTNAME"
21
21
22_AUTOSAVE="true"
22_AUTOSAVE="true"
@@ -34,13 +34,18 @@ calc_threads
34_CPU_ENABLED="true"
34_CPU_ENABLED="true"
35_CPU_HUGE_PAGES="true"
35_CPU_HUGE_PAGES="true"
36_CPU_HW_AES="$_AES_NI"
36_CPU_HW_AES="$_AES_NI"
37−_CPU_PRIORITY="null"
37+_CPU_PRIORITY='null'
38_CPU_ASM="true"
38_CPU_ASM="true"
39_CPU_CN="$_ENV_CPU_THREAD_AFFINITY"
39_CPU_CN="$_ENV_CPU_THREAD_AFFINITY"
40
40
41_CPU_CN_0="false"
41_CPU_CN_0="false"
42_CPU_CN_LITE_0="false"
42_CPU_CN_LITE_0="false"
43
43
44+_OPENCL_ENABLED="false"
45+_OPENCL_CACHE="true"
46+_OPENCL_LOADER='null'
47+_OPENCL_PLATFORM="AMD"
48+
44_DONATE_LEVEL="5"
49_DONATE_LEVEL="5"
45
50
46_DONATE_OVER_PROXY="1"
51_DONATE_OVER_PROXY="1"
@@ -48,10 +53,10 @@ _DONATE_OVER_PROXY="1"
48_HTTP_ENABLED="true"
53_HTTP_ENABLED="true"
49_HTTP_HOST=$(hostname --all-ip-addresses | awk '{print $1}')
54_HTTP_HOST=$(hostname --all-ip-addresses | awk '{print $1}')
50_HTTP_PORT="8080"
55_HTTP_PORT="8080"
51−_HTTP_ACCESS_TOKEN="null"
56+_HTTP_ACCESS_TOKEN='null'
52_HTTP_RESTRICTED="false"
57_HTTP_RESTRICTED="false"
53
58
54−_LOG_FILE="null"
59+_LOG_FILE='null'
55
60
56_POOLS_ALGO="cn/r"
61_POOLS_ALGO="cn/r"
57_POOLS_URL="$_POOL_SERVER_URL:$_POOL_SERVER_PORT"
62_POOLS_URL="$_POOL_SERVER_URL:$_POOL_SERVER_PORT"
@@ -61,8 +66,8 @@ _POOLS_RIG_ID="$HOSTNAME"
61_POOLS_NICEHASH="true"
66_POOLS_NICEHASH="true"
62_POOLS_KEEPALIVE="true"
67_POOLS_KEEPALIVE="true"
63_POOLS_ENABLED="true"
68_POOLS_ENABLED="true"
64−_POOLS_TLS="null"
69+_POOLS_TLS='null'
65−_POOLS_TLS_FINDERPRINT="null"
70+_POOLS_TLS_FINDERPRINT='null'
66_POOLS_DAEMON="false"
71_POOLS_DAEMON="false"
67
72
68_PRINT_TIME="30"
73_PRINT_TIME="30"
@@ -72,7 +77,7 @@ _RETRIES_PAUSE="5"
72
77
73_SYSLOG="false"
78_SYSLOG="false"
74
79
75−_USER_AGENT="null"
80+_USER_AGENT='null'
76
81
77_WATCH="true"
82_WATCH="true"
78
83