Skip to content

Commit

Permalink
style: use 2 spaces for YAML indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
daks committed Jul 18, 2022
1 parent fffc64e commit c004efc
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 85 deletions.
50 changes: 25 additions & 25 deletions proftpd/database.sls
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,31 @@
- Include /etc/proftpd/sql.conf
{{ proftpd.sql_config }}:
file.managed:
- source: salt://proftpd/files/sql.conf
- user: root
- group: root
- mode: 644
- template: jinja
- defaults:
SQLBackend: {{ salt['pillar.get']('proftpd:SQL:SQLBackend') }}
SQLLogFile: {{ salt['pillar.get']('proftpd:SQL:SQLLogFile') }}
SQLEngine: {{ salt['pillar.get']('proftpd:SQL:SQLEngine') }}
SQLAuthenticate: {{ salt['pillar.get']('proftpd:SQL:SQLAuthenticate') }}
SQLAuthTypes: {{ salt['pillar.get']('proftpd:SQL:SQLAuthTypes') }}
AuthOrder: {{ salt['pillar.get']('proftpd:SQL:AuthOrder') }}
SQLConnectInfo: {{ salt['pillar.get']('proftpd:SQL:SQLConnectInfo') }}
SQLUserInfo: {{ salt['pillar.get']('proftpd:SQL:SQLUserInfo') }}
SQLGroupInfo: {{ salt['pillar.get']('proftpd:SQL:SQLGroupInfo') }}
SQLUserWhereClause: {{ salt['pillar.get']('proftpd:SQL:SQLUserWhereClause') }}
SQLMinID: {{ salt['pillar.get']('proftpd:SQL:SQLMinID') }}
SQLMinUserGID: {{ salt['pillar.get']('proftpd:SQL:SQLMinUserGID') }}
SQLNamedQuerylogin: {{ salt['pillar.get']('proftpd:SQL:SQLNamedQuery:login') }}
SQLNamedQuerydownload: {{ salt['pillar.get']('proftpd:SQL:SQLNamedQuery:download') }}
SQLNamedQueryupload: {{ salt['pillar.get']('proftpd:SQL:SQLNamedQuery:upload') }}
SQLLogPASS: {{ salt['pillar.get']('proftpd:SQL:SQLLog:PASS') }}
SQLLogRETR: {{ salt['pillar.get']('proftpd:SQL:SQLLog:RETR') }}
SQLLogSTOR: {{ salt['pillar.get']('proftpd:SQL:SQLLog:STOR') }}
file.managed:
- source: salt://proftpd/files/sql.conf
- user: root
- group: root
- mode: 644
- template: jinja
- defaults:
SQLBackend: {{ salt['pillar.get']('proftpd:SQL:SQLBackend') }}
SQLLogFile: {{ salt['pillar.get']('proftpd:SQL:SQLLogFile') }}
SQLEngine: {{ salt['pillar.get']('proftpd:SQL:SQLEngine') }}
SQLAuthenticate: {{ salt['pillar.get']('proftpd:SQL:SQLAuthenticate') }}
SQLAuthTypes: {{ salt['pillar.get']('proftpd:SQL:SQLAuthTypes') }}
AuthOrder: {{ salt['pillar.get']('proftpd:SQL:AuthOrder') }}
SQLConnectInfo: {{ salt['pillar.get']('proftpd:SQL:SQLConnectInfo') }}
SQLUserInfo: {{ salt['pillar.get']('proftpd:SQL:SQLUserInfo') }}
SQLGroupInfo: {{ salt['pillar.get']('proftpd:SQL:SQLGroupInfo') }}
SQLUserWhereClause: {{ salt['pillar.get']('proftpd:SQL:SQLUserWhereClause') }}
SQLMinID: {{ salt['pillar.get']('proftpd:SQL:SQLMinID') }}
SQLMinUserGID: {{ salt['pillar.get']('proftpd:SQL:SQLMinUserGID') }}
SQLNamedQuerylogin: {{ salt['pillar.get']('proftpd:SQL:SQLNamedQuery:login') }}
SQLNamedQuerydownload: {{ salt['pillar.get']('proftpd:SQL:SQLNamedQuery:download') }}
SQLNamedQueryupload: {{ salt['pillar.get']('proftpd:SQL:SQLNamedQuery:upload') }}
SQLLogPASS: {{ salt['pillar.get']('proftpd:SQL:SQLLog:PASS') }}
SQLLogRETR: {{ salt['pillar.get']('proftpd:SQL:SQLLog:RETR') }}
SQLLogSTOR: {{ salt['pillar.get']('proftpd:SQL:SQLLog:STOR') }}
{{ proftpd.modules_config }}:
file.append:
Expand Down
120 changes: 60 additions & 60 deletions proftpd/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ proftpd:
{% if salt['pillar.get']('proftpd:Modules') %}
{{ proftpd.modules_config }}:
file.managed:
- source: salt://proftpd/files/modules.conf
- user: root
- group: root
- mode: 644
- makedirs: True
- template: jinja
- context:
Modules: {{ salt['pillar.get']('proftpd:Modules') }}
file.managed:
- source: salt://proftpd/files/modules.conf
- user: root
- group: root
- mode: 644
- makedirs: True
- template: jinja
- context:
Modules: {{ salt['pillar.get']('proftpd:Modules') }}
proftpd_modules_service_restart:
service.running:
Expand All @@ -35,54 +35,54 @@ proftpd_modules_service_restart:
{% endif %}
{{ proftpd.config }}:
file.managed:
- source: salt://proftpd/files/proftpd.conf
- user: root
- group: root
- mode: 644
- template: jinja
- defaults:
modules_config: {{ salt['pillar.get']('proftpd:modules_config') }}
ServerName: {{ salt['pillar.get']('proftpd:ServerName') }}
ServerType: {{ salt['pillar.get']('proftpd:ServerType') }}
ServerIdent: {{ salt['pillar.get']('proftpd:ServerIdent', '"off"') }}
DefaultServer: {{ salt['pillar.get']('proftpd:DefaultServer') }}
Port: {{ salt['pillar.get']('proftpd:Port', 21) }}
MaxInstances: {{ salt['pillar.get']('proftpd:MaxInstances') }}
DeferWelcome: {{ salt['pillar.get']('proftpd:DeferWelcome') }}
MultilineRFC2228: {{ salt['pillar.get']('proftpd:MultilineRFC2228') }}
ShowSymlinks: {{ salt['pillar.get']('proftpd:ShowSymlinks') }}
AllowOverwrite: {{ salt['pillar.get']('proftpd:AllowOverwrite') }}
AllowStoreRestart: {{ salt['pillar.get']('proftpd:AllowStoreRestart') }}
AllowRetrieveRestart: {{ salt['pillar.get']('proftpd:AllowRetrieveRestart') }}
UseReverseDNS: {{ salt['pillar.get']('proftpd:UseReverseDNS') }}
IdentLookups: {{ salt['pillar.get']('proftpd:IdentLookups') }}
ListOptions: {{ salt['pillar.get']('proftpd:ListOptions') }}
DisplayChdir: {{ salt['pillar.get']('proftpd:DisplayChdir') }}
DelayEngine: {{ salt['pillar.get']('proftpd:DelayEngine') }}
TimeoutLogin: {{ salt['pillar.get']('proftpd:TimeoutLogin') }}
TimeoutNoTransfer: {{ salt['pillar.get']('proftpd:TimeoutNoTransfer') }}
TimeoutStalled: {{ salt['pillar.get']('proftpd:TimeoutStalled') }}
TimeoutIdle: {{ salt['pillar.get']('proftpd:TimeoutIdle') }}
RootLogin: {{ salt['pillar.get']('proftpd:RootLogin') }}
RequireValidShell: {{ salt['pillar.get']('proftpd:RequireValidShell') }}
User: {{ salt['pillar.get']('proftpd:User') }}
Group: {{ salt['pillar.get']('proftpd:Group') }}
Umask: {{ salt['pillar.get']('proftpd:Umask') }}
DefaultRoot: {{ salt['pillar.get']('proftpd:DefaultRoot') }}
DenyFilter: {{ salt['pillar.get']('proftpd:DenyFilter') }}
DirUmask: {{ salt['pillar.get']('proftpd:DirUmask') }}
DirAllowOverwrite: {{ salt['pillar.get']('proftpd:DirAllowOverwrite') }}
DirHideNoAccess: {{ salt['pillar.get']('proftpd:DirHideNoAccess') }}
DirLimit: {{ salt['pillar.get']('proftpd:DirLimit') }}
PathAllowFilter: {{ salt['pillar.get']('proftpd:PathAllowFilter') }}
PathDenyFilter: {{ salt['pillar.get']('proftpd:PathDenyFilter') }}
LogFormatDefault: {{ salt['pillar.get']('proftpd:LogFormat:default') }}
LogFormatAuth: {{ salt['pillar.get']('proftpd:LogFormat:auth') }}
LogFormatWrite: {{ salt['pillar.get']('proftpd:LogFormat:write') }}
SyslogLevel: {{ salt['pillar.get']('proftpd:SyslogLevel') }}
ExtendedLogAccess: {{ salt['pillar.get']('proftpd:ExtendedLog:Access') }}
ExtendedLogAuth: {{ salt['pillar.get']('proftpd:ExtendedLog:Auth') }}
ExtendedLogAll: {{ salt['pillar.get']('proftpd:ExtendedLog:All') }}
ClamAV: {{ salt['pillar.get']('proftpd:ClamAV') }}
ClamLocalSocket: {{ salt['pillar.get']('proftpd:ClamLocalSocket') }}
file.managed:
- source: salt://proftpd/files/proftpd.conf
- user: root
- group: root
- mode: 644
- template: jinja
- defaults:
modules_config: {{ salt['pillar.get']('proftpd:modules_config') }}
ServerName: {{ salt['pillar.get']('proftpd:ServerName') }}
ServerType: {{ salt['pillar.get']('proftpd:ServerType') }}
ServerIdent: {{ salt['pillar.get']('proftpd:ServerIdent', '"off"') }}
DefaultServer: {{ salt['pillar.get']('proftpd:DefaultServer') }}
Port: {{ salt['pillar.get']('proftpd:Port', 21) }}
MaxInstances: {{ salt['pillar.get']('proftpd:MaxInstances') }}
DeferWelcome: {{ salt['pillar.get']('proftpd:DeferWelcome') }}
MultilineRFC2228: {{ salt['pillar.get']('proftpd:MultilineRFC2228') }}
ShowSymlinks: {{ salt['pillar.get']('proftpd:ShowSymlinks') }}
AllowOverwrite: {{ salt['pillar.get']('proftpd:AllowOverwrite') }}
AllowStoreRestart: {{ salt['pillar.get']('proftpd:AllowStoreRestart') }}
AllowRetrieveRestart: {{ salt['pillar.get']('proftpd:AllowRetrieveRestart') }}
UseReverseDNS: {{ salt['pillar.get']('proftpd:UseReverseDNS') }}
IdentLookups: {{ salt['pillar.get']('proftpd:IdentLookups') }}
ListOptions: {{ salt['pillar.get']('proftpd:ListOptions') }}
DisplayChdir: {{ salt['pillar.get']('proftpd:DisplayChdir') }}
DelayEngine: {{ salt['pillar.get']('proftpd:DelayEngine') }}
TimeoutLogin: {{ salt['pillar.get']('proftpd:TimeoutLogin') }}
TimeoutNoTransfer: {{ salt['pillar.get']('proftpd:TimeoutNoTransfer') }}
TimeoutStalled: {{ salt['pillar.get']('proftpd:TimeoutStalled') }}
TimeoutIdle: {{ salt['pillar.get']('proftpd:TimeoutIdle') }}
RootLogin: {{ salt['pillar.get']('proftpd:RootLogin') }}
RequireValidShell: {{ salt['pillar.get']('proftpd:RequireValidShell') }}
User: {{ salt['pillar.get']('proftpd:User') }}
Group: {{ salt['pillar.get']('proftpd:Group') }}
Umask: {{ salt['pillar.get']('proftpd:Umask') }}
DefaultRoot: {{ salt['pillar.get']('proftpd:DefaultRoot') }}
DenyFilter: {{ salt['pillar.get']('proftpd:DenyFilter') }}
DirUmask: {{ salt['pillar.get']('proftpd:DirUmask') }}
DirAllowOverwrite: {{ salt['pillar.get']('proftpd:DirAllowOverwrite') }}
DirHideNoAccess: {{ salt['pillar.get']('proftpd:DirHideNoAccess') }}
DirLimit: {{ salt['pillar.get']('proftpd:DirLimit') }}
PathAllowFilter: {{ salt['pillar.get']('proftpd:PathAllowFilter') }}
PathDenyFilter: {{ salt['pillar.get']('proftpd:PathDenyFilter') }}
LogFormatDefault: {{ salt['pillar.get']('proftpd:LogFormat:default') }}
LogFormatAuth: {{ salt['pillar.get']('proftpd:LogFormat:auth') }}
LogFormatWrite: {{ salt['pillar.get']('proftpd:LogFormat:write') }}
SyslogLevel: {{ salt['pillar.get']('proftpd:SyslogLevel') }}
ExtendedLogAccess: {{ salt['pillar.get']('proftpd:ExtendedLog:Access') }}
ExtendedLogAuth: {{ salt['pillar.get']('proftpd:ExtendedLog:Auth') }}
ExtendedLogAll: {{ salt['pillar.get']('proftpd:ExtendedLog:All') }}
ClamAV: {{ salt['pillar.get']('proftpd:ClamAV') }}
ClamLocalSocket: {{ salt['pillar.get']('proftpd:ClamLocalSocket') }}

0 comments on commit c004efc

Please sign in to comment.