updated some jinja templates
This commit is contained in:
parent
6e2a084f61
commit
5e2e60d3c8
@ -1,4 +1,5 @@
|
||||
{%- from "dkron/map.jinja" import dkron with context -%}
|
||||
## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }}
|
||||
{%- from "dkron/map.jinja" import dkron with context %}
|
||||
[Unit]
|
||||
Description=dkron - Open Source task scheduler
|
||||
Documentation=https://dkron.io/
|
||||
@ -12,4 +13,4 @@ SuccessExitStatus=3 4
|
||||
RestartForceExitStatus=3 4
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
WantedBy=multi-user.target
|
||||
|
@ -1,3 +1,4 @@
|
||||
## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }}
|
||||
{%- from "qrz/map.jinja" import qrz with context %}
|
||||
[Unit]
|
||||
Description=QRZ
|
||||
@ -8,4 +9,4 @@ Type=simple
|
||||
ExecStart={{ qrz.install_dir }}/qrz/qrz -configfile {{ qrz.install_dir }}/config/common.ini -port {{ qrz.port }}
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
WantedBy=multi-user.target
|
||||
|
@ -22,7 +22,7 @@ $IncludeConfig /etc/rsyslog.d/*.conf
|
||||
|
||||
auth,authpriv.* /var/log/auth.log
|
||||
*.*;auth,authpriv.none -/var/log/syslog
|
||||
cron.* /var/log/cron.log
|
||||
cron.* /var/log/cron.log
|
||||
daemon.* -/var/log/daemon.log
|
||||
kern.* -/var/log/kern.log
|
||||
lpr.* -/var/log/lpr.log
|
||||
|
@ -1,4 +1,6 @@
|
||||
{%- from "ssh/map.jinja" import ssh with context -%}
|
||||
## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }}
|
||||
|
||||
{%- from "ssh/map.jinja" import ssh with context %}
|
||||
|
||||
{% set net4=[] -%}
|
||||
{%- for key, value in salt['pillar.get']('net:ipv4_networks').items() -%}
|
||||
@ -17,4 +19,4 @@
|
||||
Match Address {{ net4|join(',') }}
|
||||
PasswordAuthentication yes
|
||||
Match Address {{ net6|join(',') }}
|
||||
PasswordAuthentication yes
|
||||
PasswordAuthentication yes
|
||||
|
@ -1,4 +1,5 @@
|
||||
## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }}
|
||||
|
||||
{%- from "sudo/map.jinja" import sudo with context %}
|
||||
|
||||
{%- if sudo.config.defaults is defined -%}
|
||||
|
@ -1,4 +1,5 @@
|
||||
{%- from "telegraf/map.jinja" import telegraf with context -%}
|
||||
## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }}
|
||||
{%- from "telegraf/map.jinja" import telegraf with context %}
|
||||
[Unit]
|
||||
Description=The plugin-driven server agent for reporting metrics into InfluxDB
|
||||
Documentation=https://github.com/influxdata/telegraf
|
||||
@ -14,4 +15,4 @@ RestartForceExitStatus=SIGPIPE
|
||||
KillMode=control-group
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
WantedBy=multi-user.target
|
||||
|
@ -1,8 +1,9 @@
|
||||
## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }}
|
||||
|
||||
{% from "tor/map.jinja" import tor with context %}
|
||||
|
||||
ORPort {{ tor.config.exit_port }}
|
||||
SocksPort {{ tor.config.client_host }}:{{ tor.config.client_port }}
|
||||
ExitPolicy {{ tor.config.exit_policy }}
|
||||
Nickname {{ tor.config.nickname }}
|
||||
ContactInfo {{ tor.config.syscontact }}
|
||||
ContactInfo {{ tor.config.syscontact }}
|
||||
|
@ -1,6 +1,7 @@
|
||||
## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }}
|
||||
|
||||
{%- from "vsftpd/map.jinja" import vsftpd with context %}
|
||||
|
||||
{%- for key, value in vsftpd.config.items() %}
|
||||
{{ key }}={{ value }}
|
||||
{%- endfor %}
|
||||
{%- endfor %}
|
||||
|
@ -11,6 +11,10 @@ export GOROOT=/usr/local/go
|
||||
export PATH=$PATH:$GOROOT/bin:$GOPATH/bin
|
||||
|
||||
|
||||
# Rust settings
|
||||
export PATH=$PATH:$HOME/.cargo/bin
|
||||
|
||||
|
||||
# Oh my ZSH settings
|
||||
export ZSH=/usr/share/oh-my-zsh
|
||||
ZSH_THEME="jreese"
|
||||
@ -32,4 +36,4 @@ fi
|
||||
|
||||
# Misc settings
|
||||
bindkey -e
|
||||
unsetopt share_history
|
||||
unsetopt share_history
|
||||
|
Loading…
Reference in New Issue
Block a user