Skip to content

Commit ab495cb

Browse files
committed
stabilization
1 parent 463bc8f commit ab495cb

File tree

12 files changed

+18
-8
lines changed
  • rootfs/container/base
    • defaults/_container
    • functions/container
    • modules
      • cron/rootfs/container/base/defaults/scheduling/_cron
      • fail2ban/rootfs/container/base/defaults/firewall/_iptables
      • fluentbit/rootfs/container/base/defaults/logging/_fluentbit
      • logrotate/rootfs/container/base/defaults/logging/_logrotate
      • msmtp/rootfs/container/base/defaults/messaging/_msmtp
      • tailscale/rootfs/container/base/defaults/vpn/_tailscale
      • zabbix/rootfs/container/base/defaults/monitoring/_zabbix
      • zerotier/rootfs/container/base/defaults/vpn/_zerotier

12 files changed

+18
-8
lines changed

rootfs/container/base/defaults/_container/container

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#
33
# SPDX-License-Identifier: MIT
44

5+
output_off
56
set_env CONTAINER_CUSTOM_PATH="/override/custom/" nfrastack/base
67
set_env CONTAINER_CUSTOM_SCRIPTS_PATH="/override/custom-scripts/" nfrastack/base
78
set_env CONTAINER_ENABLE_CUSTOM_BASH_PROMPT="TRUE" nfrastack/base
@@ -29,4 +30,4 @@ set_env CONTAINER_REMOVE_INIT="none" nfrastack/base
2930
set_env CONTAINER_REMOVE_INIT_EXCLUDE="" nfrastack/base
3031
set_env CONTAINER_SCHEDULING_LOCATION="/container/cron/" nfrastack/base
3132
set_env CONTAINER_SCHEDULING_LOCATION_OVERRIDE="/override/cron/" nfrastack/base
32-
33+
output_on

rootfs/container/base/functions/container/available/_aaa-core/aaa-core

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ sanity_var() {
169169

170170
set_env() {
171171
## Function to set an environment variable with a new value
172-
output_off
173172
local var_input="${1}"
174173
local var_name="${var_input%%=*}"
175174
local var_value="${var_input#*=}"
@@ -191,7 +190,6 @@ set_env() {
191190
fi
192191

193192
export "${var_name}"="${var_value}"
194-
output_on
195193
}
196194

197195
set_timezone() {

rootfs/container/base/functions/container/available/_aaa-core/aaa-core.advanced

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ sanity_var() {
168168

169169
set_env() {
170170
## Function to set an environment variable with a new value
171-
output_off
172171
local var_input="${1}"
173172
local var_name="${var_input%%=*}"
174173
local var_value="${var_input#*=}"
@@ -190,7 +189,6 @@ set_env() {
190189
fi
191190

192191
export "${var_name}"="${var_value}"
193-
output_on
194192
}
195193

196194
set_timezone() {

rootfs/container/base/functions/container/build.d/aaa-core

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ sanity_var() {
169169

170170
set_env() {
171171
## Function to set an environment variable with a new value
172-
output_off
173172
local var_input="${1}"
174173
local var_name="${var_input%%=*}"
175174
local var_value="${var_input#*=}"
@@ -191,7 +190,6 @@ set_env() {
191190
fi
192191

193192
export "${var_name}"="${var_value}"
194-
output_on
195193
}
196194

197195
set_timezone() {

rootfs/container/base/modules/cron/rootfs/container/base/defaults/scheduling/_cron/cron

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
#
33
# SPDX-License-Identifier: MIT
44

5+
output_off
56
set_env CRON_BINARY="crond" nfrastack/base
67
set_env SCHEDULING_LOG_TYPE="FILE" nfrastack/base
78
set_env SCHEDULING_LOG_LOCATION="/var/log/cron/" nfrastack/base
89
set_env SCHEDULING_LOG_LEVEL="8" nfrastack/base
10+
output_on

rootfs/container/base/modules/fail2ban/rootfs/container/base/defaults/firewall/_iptables/iptables

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
#
33
# SPDX-License-Identifier: MIT
44

5+
output_off
56
set_env IPTABLES_BINARY="iptables" nfrastack/base
67
set_env IPTABLES_RULES_PATH="/override/iptables/" nfrastack/base
78
set_env IPTABLES_RULES_FILE="iptables.rules" nfrastack/base
9+
output_on

rootfs/container/base/modules/fluentbit/rootfs/container/base/defaults/logging/_fluentbit/fluentbit

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#
33
# SPDX-License-Identifier: MIT
44

5+
output_off
56
set_env FLUENTBIT_BINARY="fluent-bit" nfrastack/base
67
set_env FLUENTBIT_CONFIG_PARSERS="parsers.conf" nfrastack/base
78
set_env FLUENTBIT_CONFIG_PLUGINS="plugins.conf" nfrastack/base
@@ -17,3 +18,4 @@ set_env FLUENTBIT_STORAGE_SYNC="normal" nfrastack/base
1718
set_env FLUENTBIT_TAIL_BUFFER_CHUNK_SIZE="32k" nfrastack/base
1819
set_env FLUENTBIT_TAIL_BUFFER_MAX_SIZE="32k" nfrastack/base
1920
set_env FLUENTBIT_TAIL_DB_JOURNAL_MODE="WAL" nfrastack/base
21+
output_on

rootfs/container/base/modules/logrotate/rootfs/container/base/defaults/logging/_logrotate/logrotate

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#
33
# SPDX-License-Identifier: MIT
44

5+
output_off
56
case "$(container_info distro)" in
67
alpine )
78
case "$(container_info variant)" in
@@ -14,3 +15,4 @@ esac
1415
set_env LOGSHIPPING_AUTO_CONFIG_LOGROTATE="TRUE" nfrastack/base
1516
set_env LOGROTATE_COMPRESSION_VALUE="8" nfrastack/base
1617
set_env LOGROTATE_RETAIN_DAYS="7" nfrastack/base
18+
output_on

rootfs/container/base/modules/msmtp/rootfs/container/base/defaults/messaging/_msmtp/msmtp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
#
33
# SPDX-License-Identifier: MIT
44

5+
output_off
56
set_env MSMTP_BINARY="msmtp" nfrastack/base
7+
output_on

rootfs/container/base/modules/tailscale/rootfs/container/base/defaults/vpn/_tailscale/tailscale

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#
33
# SPDX-License-Identifier: MIT
44

5+
output_off
56
set_env TAILSCALE_BINARY="tailscale" nfrastack/base
67
set_env TAILSCALE_DATA_PATH="/var/lib/tailscale/" nfrastack/base
78
set_env TAILSCALE_LOG_FILE="tailscaled.log" nfrastack/base
@@ -13,3 +14,4 @@ set_env TAILSCALE_SOCKET_PATH="/var/run/tailscale/" nfrastack/base
1314
set_env TAILSCALE_SOCKET_FILE="tailscaled.sock" nfrastack/base
1415
set_env TAILSCALE_ENABLE_LOGTAIL="FALSE" nfrastack/base
1516
set_env TAILSCALE_USER="root" nfrastack/base
17+
output_on

0 commit comments

Comments
 (0)