created templates folder on each state

states/androidstudio/install.sls

@@ -23,9 +23,8 @@ androidstudio-link:
 androidstudio-shortcut:
   file.managed:
     - name: /usr/share/applications/jetbrains-studio.desktop
-    - source: salt://androidstudio/jetbrains-studio.desktop.j2
+    - source: salt://androidstudio/templates/jetbrains-studio.desktop.j2
     - user: root
     - group: root
     - mode: 644
     - template: jinja
-

states/androidstudio/templates/jetbrains-studio.desktop.j2

@@ -9,4 +9,4 @@ Exec="{{ androidstudio.install_dir }}/androidstudio/bin/studio.sh" %f
 Comment=Develop with pleasure on Android!
 Categories=Development;IDE;
 Terminal=false
-StartupWMClass=jetbrains-studio
+StartupWMClass=jetbrains-studio

states/arduino/install.sls

@@ -28,7 +28,7 @@ arduino-bin-symlink:
 arduino-shortcut:
   file.managed:
     - name: /usr/share/applications/arduino-arduinoide.desktop
-    - source: salt://arduino/arduino-arduinoide.desktop.j2
+    - source: salt://arduino/templates/arduino-arduinoide.desktop.j2
     - template: jinja
     - user: root
     - group: root

states/arduino/templates/arduino-arduinoide.desktop.j2

@@ -11,4 +11,4 @@ Terminal=false
 Categories=Development;IDE;Electronics;
 MimeType=text/x-arduino
 Keywords=embedded electronics;electronics;avr;microcontroller;
-StartupWMClass=processing-app-Base
+StartupWMClass=processing-app-Base

states/autoconfig/install.sls

@@ -17,7 +17,7 @@ autoconfig-maildir:
 autoconfig-file:
   file.managed:
     - name: {{ autoconfig.install_dir }}/autoconfig/mail/config-v1.1.xml
-    - source: salt://autoconfig/config-v1.1.xml.j2
+    - source: salt://autoconfig/templates/config-v1.1.xml.j2
     - user: root
     - group: root
     - mode: 0644

states/bareos/config.sls

@@ -9,7 +9,7 @@ bareos-fd-config-dir:
 bareos-fd-config:
   file.managed:
     - name: {{ bareos.config_dir }}/bareos-fd.conf
-    - source: salt://bareos/bareos-fd.conf.j2
+    - source: salt://bareos/templates/bareos-fd.conf.j2
     - user: root
     - group: root
     - mode: 0644

states/bareos/service.sls

@@ -2,7 +2,7 @@
 bareos-fd-service-file:
   file.managed:
     - name: /etc/systemd/system/bareos-fd.service
-    - source: salt://bareos/bareos-fd.service.j2
+    - source: salt://bareos/templates/bareos-fd.service.j2
     - user: root
     - group: root
     - template: jinja

states/bareos/templates/bareos-fd.conf.j2

@@ -2,13 +2,13 @@
 
 FileDaemon {
   Name = {{ grains.get('host') }}
-  Maximum Concurrent Jobs = {{ salt['pillar.get']('bareos:director:max_concurrent_jobs', default=10) }} 
-  Compatible = {{ salt['pillar.get']('bareos:director:compatible', default='No') }} 
-  Working Directory = {{ salt['pillar.get']('bareos:director:working_dir', default='/var/run') }} 
+  Maximum Concurrent Jobs = {{ salt['pillar.get']('bareos:director:max_concurrent_jobs', default=10) }}
+  Compatible = {{ salt['pillar.get']('bareos:director:compatible', default='No') }}
+  Working Directory = {{ salt['pillar.get']('bareos:director:working_dir', default='/var/run') }}
 }
 
 Director {
-  Name = {{ salt['pillar.get']('bareos:director:name', default='bareos-dir') }} 
+  Name = {{ salt['pillar.get']('bareos:director:name', default='bareos-dir') }}
   Address = {{ salt['pillar.get']('bareos:director:addr', default='localhost') }}
   Password = "{{ salt['pillar.get']('bareos:director:password', default='password') }}"
   Connection From Client To Director = {{ salt['pillar.get']('bareos:director:initiated', default='No') }}
@@ -17,4 +17,4 @@ Director {
 Messages {
   Name = standard
   director = {{ salt['pillar.get']('bareos:director:name',default='bareos-dir') }} = all, !skipped, !restored
-}
+}

states/bareos/templates/bareos-fd.service.j2

@@ -18,4 +18,4 @@ ExecStart=/usr/sbin/bareos-fd -c /etc/bareos/bareos-fd.conf
 SuccessExitStatus=0 15
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

states/chrome/config.sls

@@ -11,7 +11,7 @@ chrome-directory-{{ dir }}:
 chrome-policies-managed:
   file.managed:
     - name: /etc/opt/chrome/policies/managed/managed_policies.json
-    - source: salt://chrome/config.json.j2
+    - source: salt://chrome/templates/config.json.j2
     - context:
         config: {{ chrome.config.managed }}
     - template: jinja

states/config/init.sls

@@ -21,7 +21,7 @@ config-ini-content:
 config-json-content:
   file.managed:
     - name: {{ config.install_dir }}/{{ config.json_filename }}
-    - source: salt://config/config.json.j2
+    - source: salt://config/templates/config.json.j2
     - user: root
     - mode: "0755"
     - template: jinja
@@ -29,7 +29,7 @@ config-json-content:
 config-yaml-content:
   file.managed:
     - name: {{ config.install_dir }}/{{ config.yaml_filename }}
-    - source: salt://config/config.yml.j2
+    - source: salt://config/templates/config.yml.j2
     - user: root
     - mode: "0755"
     - template: jinja

states/dip/service.sls

@@ -3,7 +3,7 @@
 dip-service-file:
   file.managed:
     - name: /etc/systemd/system/dip.service
-    - source: salt://dip/dip.service.j2
+    - source: salt://dip/templates/dip.service.j2
     - user: root
     - group: root
     - template: jinja
@@ -11,4 +11,4 @@ dip-service-file:
 dip-service:
   service.running:
     - name: dip
-    - enable: true
+    - enable: true

states/dip/templates/dip.service.j2

@@ -10,4 +10,4 @@ WorkingDirectory={{ dip.install_dir }}/dip
 ExecStart={{ dip.install_dir }}/dip/dip -host "{{ dip.host }}" -port {{ dip.port }}
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

states/docker/config.sls

@@ -7,10 +7,10 @@ docker-config-dir:
 docker-config-file:
   file.managed:
     - name: {{ docker.config_dir }}/{{ docker.config_file }}
-    - source: salt://docker/daemon.json.j2
+    - source: salt://docker/templates/daemon.json.j2
     - mode: 644
     - template: jinja
     - require:
       - file: docker-config-dir
     - watch_in:
-      - service: docker-service
+      - service: docker-service

states/docker/templates/daemon.json.j2

@@ -1,2 +1,2 @@
 {%- from "docker/map.jinja" import docker with context -%}
-{{ docker.daemon.config | tojson }}
+{{ docker.daemon.config | tojson }}

states/firefox/install.sls

@@ -30,7 +30,7 @@ firefox-bin-symlink:
 firefox-shortcut:
   file.managed:
     - name: /usr/share/applications/firefox.desktop
-    - source: salt://firefox/firefox.desktop.j2
+    - source: salt://firefox/templates/firefox.desktop.j2
     - user: root
     - group: root
     - mode: 644
@@ -50,4 +50,4 @@ firefox-cleanup:
   software.cleanup:
     - name: firefox
     - path: {{ firefox.release_dir }}
-    - version: "{{ firefox.version }}"
+    - version: "{{ firefox.version }}"

states/firefox/templates/firefox.desktop.j2

@@ -8,4 +8,4 @@ Icon=firefox
 Type=Application
 Categories=Network;WebBrowser;
 MimeType=application/pdf;application/rdf+xml;application/rss+xml;application/xhtml+xml;application/xhtml_xml;application/xml;image/gif;image/jpeg;image/png;image/webp;text/html;text/xml;x-scheme-handler/http;x-scheme-handler/https;
-Version=1.0
+Version=1.0

states/git/defaults.yaml

@@ -0,0 +1,2 @@
+---
+git:

states/git/init.sls

@@ -0,0 +1 @@
+---

states/gitea/config.sls

@@ -5,11 +5,11 @@
 gitea-config:
   file.managed:
     - name: {{ gitea.configfile }}
-    - source: salt://gitea/files/app.ini.j2
+    - source: salt://gitea/templates/app.ini.j2
     - template: jinja
     - user: git
     - group: git
     - mode: 600
     - makedirs: true
     - require:
-      - git
+      - git

states/gitea/service.sls

@@ -5,7 +5,7 @@
 gitea-service:
   file.managed:
     - name: /etc/systemd/system/gitea.service
-    - source: salt://gitea/files/gitea.service.j2
+    - source: salt://gitea/templates/gitea.service.j2
     - user: root
     - group: root
     - mode: 644

states/gitea/templates/app.ini.j2

@@ -11,4 +11,4 @@
 {{ subkey|upper() }} = {{ subval }}
 {% endfor -%}
 {% endif %}
-{% endfor -%}
+{% endfor -%}

states/gitea/templates/gitea.service.j2

@@ -15,4 +15,4 @@ Restart=always
 Environment=USER={{ gitea.user }} HOME={{ gitea.workingdir }}
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

states/go-aptproxy/service.sls

@@ -3,7 +3,7 @@
 go-aptproxy-service-file:
   file.managed:
     - name: /etc/systemd/system/go-aptproxy.service
-    - source: salt://go-aptproxy/go-aptproxy.service.j2
+    - source: salt://go-aptproxy/templates/go-aptproxy.service.j2
     - user: root
     - group: root
     - template: jinja

states/go-aptproxy/templates/go-aptproxy.service.j2

@@ -14,4 +14,4 @@ RestartForceExitStatus=SIGPIPE
 KillMode=control-group
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

states/influxdb/config.sls

@@ -11,7 +11,7 @@ influxdb-config-dir:
 influxdb-config-file:
   file.managed:
     - name: {{ influxdb.config_dir }}/{{ influxdb.config_file }}
-    - source: salt://influxdb/influxdb.conf.j2
+    - source: salt://influxdb/templates/influxdb.conf.j2
     - user: {{ influxdb.user.name }}
     - group: {{ influxdb.group.name }}
     - mode: 644

states/influxdb/service.sls

@@ -3,7 +3,7 @@
 influxdb-service-file:
   file.managed:
     - name: /etc/systemd/system/influxdb.service
-    - source: salt://influxdb/influxdb.service.j2
+    - source: salt://influxdb/templates/influxdb.service.j2
     - user: root
     - group: root
     - mode: 644
@@ -12,4 +12,4 @@ influxdb-service-file:
 influxdb-service:
   service.running:
     - name: influxdb
-    - enable: true
+    - enable: true

states/influxdb/templates/influxdb.conf.j2

@@ -30,4 +30,4 @@
 
 [logging]
 
-[subscriber]
+[subscriber]

states/influxdb/templates/influxdb.service.j2

@@ -15,4 +15,4 @@ Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
-Alias=influxd.service
+Alias=influxd.service

states/influxdb/templates/v2/influxdb.service_v2.j2

@@ -13,4 +13,4 @@ Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
-Alias=influxd.service
+Alias=influxd.service

states/ipbl/service.sls

@@ -3,7 +3,7 @@
 ipbl-service-file:
   file.managed:
     - name: /etc/systemd/system/ipbl.service
-    - source: salt://ipbl/ipbl.service.j2
+    - source: salt://ipbl/templates/ipbl.service.j2
     - user: root
     - group: root
     - template: jinja

states/ipbl/templates/ipbl.service.j2

@@ -9,4 +9,4 @@ Type=simple
 ExecStart={{ ipbl.install_dir }}/ipbl/ipbl -configfile {{ ipbl.install_dir }}/config/common.ini -port {{ ipbl.port }}
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

states/ipblc/service.sls

@@ -3,7 +3,7 @@
 ipblc-service-file:
   file.managed:
     - name: /etc/systemd/system/ipblc.service
-    - source: salt://ipblc/ipblc.service.j2
+    - source: salt://ipblc/templates/ipblc.service.j2
     - user: root
     - group: root
     - template: jinja

states/ipfs/service.sls

@@ -2,7 +2,7 @@
 ipfs-service-file:
   file.managed:
     - name: /etc/systemd/system/ipfs.service
-    - source: salt://ipfs/ipfs.service.j2
+    - source: salt://ipfs/templates/ipfs.service.j2
     - watch-in:
       - service: ipfs-service
 

states/java/update-alternatives-java.sh.j2

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-{%- from "java/map.jinja" import java with context %}
-for item in $(ls {{ java.install_dir }}/default/bin)
-do
-  update-alternatives --install /usr/bin/${item} ${item} {{ java.install_dir }}/default/bin/${item} 1
-  update-alternatives --set ${item} {{ java.install_dir }}/default/bin/${item}
-done

states/micromdm/service.sls

@@ -3,7 +3,7 @@
 micromdm-service-file:
   file.managed:
     - name: /etc/systemd/system/micromdm.service
-    - source: salt://micromdm/micromdm.service.j2
+    - source: salt://micromdm/templates/micromdm.service.j2
     - user: root
     - group: root
     - mode: 644
@@ -12,4 +12,4 @@ micromdm-service-file:
 micromdm-service:
   service.running:
     - name: micromdm
-    - enable: true
+    - enable: true

states/micromdm/templates/micromdm.service.j2

@@ -15,4 +15,4 @@ Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
-Alias=micromdm.service
+Alias=micromdm.service

states/molotov/install.sls

@@ -33,7 +33,7 @@ molotov-icon:
 molotov-desktop-entry:
   file.managed:
     - name: {{ molotov.desktop_entry_path }}
-    - source: salt://molotov/molotov.desktop.j2
+    - source: salt://molotov/templates/molotov.desktop.j2
     - template: jinja
     - user: root
     - group: root

states/molotov/templates/molotov.desktop.j2

@@ -10,4 +10,4 @@ Terminal=false
 StartupWMClass=Molotov
 Type=Application
 Categories=AudioVideo;Player;
-X-Desktop-File-Install-Version=0.22
+X-Desktop-File-Install-Version=0.22

states/motd/install.sls

@@ -12,5 +12,5 @@ motd-file-link-delete:
 motd-file:
   file.managed:
     - name: /etc/motd
-    - source: salt://motd/motd.j2
+    - source: salt://motd/templates/motd.j2
     - template: jinja

states/motd/templates/motd.j2

@@ -1,4 +1,2 @@
 
 {{ salt['cmd.run']('figlet -w 120 '+salt['grains.get']('host')) }}
-
-

states/neovim/config.sls

@@ -3,10 +3,10 @@
 neovim-neovimrc-local:
   file.managed:
     - name: /etc/xdg/nvim/init.vim
-    - source: salt://neovim/init.vim.j2
+    - source: salt://neovim/templates/init.vim.j2
     - user: root
     - group: root
     - mode: 0644
     - template: jinja
     - require:
-      - pkg: neovim-pkg
+      - pkg: neovim-pkg

states/neovim/templates/init.vim.j2

@@ -33,7 +33,7 @@ nnoremap <F9> :!%:p
 if has("autocmd")
   au VimEnter,InsertLeave * silent execute '!echo -ne "\e[2 q"' | redraw!
   au InsertEnter,InsertChange *
-    \ if v:insertmode == 'i' | 
+    \ if v:insertmode == 'i' |
     \   silent execute '!echo -ne "\e[6 q"' | redraw! |
     \ elseif v:insertmode == 'r' |
     \   silent execute '!echo -ne "\e[4 q"' | redraw! |
@@ -58,4 +58,4 @@ nnoremap <silent> <C-b> :NERDTreeToggle<CR>
 vnoremap <C-a> g<C-a>
 vnoremap <C-x> g<C-x>
 vnoremap g<C-a> <C-a>
-vnoremap g<C-x> <C-x>
+vnoremap g<C-x> <C-x>

states/npf/init.sls

@@ -2,7 +2,7 @@
 npf-main-config:
   file.managed:
     - name: /etc/npf.conf
-    - source: salt://npf/npf.conf.j2
+    - source: salt://npf/templates/npf.conf.j2
     - template: jinja
     - watch_in:
       - service: npf-service

states/npf/templates/npf.conf.j2

@@ -101,4 +101,4 @@ group default {
   pass on ${{ key }} all
 {%- endif %}
 {%- endfor %}
-}
+}

states/pki/service.sls

@@ -3,7 +3,7 @@
 pki-service-file:
   file.managed:
     - name: /etc/systemd/system/pki.service
-    - source: salt://pki/pki.service.j2
+    - source: salt://pki/templates/pki.service.j2
     - user: root
     - group: root
     - template: jinja

states/pki/templates/pki.service.j2

@@ -9,4 +9,4 @@ Type=simple
 ExecStart={{ pki.install_dir }}/pki/pki -configfile {{ pki.install_dir }}/config/common.ini -port {{ pki.port }}
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

states/pycharm/install.sls

@@ -21,7 +21,7 @@ pycharm-link:
 pycharm-shortcut:
   file.managed:
     - name: /usr/share/applications/jetbrains-pycharm-ce.desktop
-    - source: salt://pycharm/jetbrains-pycharm-ce.desktop.j2
+    - source: salt://pycharm/templates/jetbrains-pycharm-ce.desktop.j2
     - template: jinja
     - user: root
     - group: root

states/pycharm/templates/jetbrains-pycharm-ce.desktop.j2

@@ -9,4 +9,4 @@ Exec="{{ pycharm.install_dir }}/pycharm/bin/pycharm.sh" %f
 Comment=Develop with pleasure!
 Categories=Development;IDE;
 Terminal=false
-StartupWMClass=jetbrains-pycharm-ce
+StartupWMClass=jetbrains-pycharm-ce

states/rsync/config.sls

@@ -2,7 +2,7 @@
 rsync-config:
   file.managed:
     - name: /etc/rsyncd.conf
-    - source: salt://rsync/rsyncd.conf.j2
+    - source: salt://rsync/templates/rsyncd.conf.j2
     - user: root
     - group: root
     - mode: 0640
@@ -10,4 +10,4 @@ rsync-config:
     - watch_in:
       - service: rsync-service
     - require:
-      - pkg: rsync-install
+      - pkg: rsync-install

states/rsyslog/config.sls

@@ -2,9 +2,9 @@
 rsyslog-main-config:
   file.managed:
     - name: /etc/rsyslog.conf
-    - source: salt://rsyslog/rsyslog.conf.j2
+    - source: salt://rsyslog/templates/rsyslog.conf.j2
     - user: root
     - group: root
     - template: jinja
     - watch_in:
-      - service: rsyslog-service
+      - service: rsyslog-service

states/rsyslog/templates/rsyslog.conf.j2

@@ -41,4 +41,4 @@ mail.err                        /var/log/mail.err
 
 *.emerg                         :omusrmsg:*
 
-*.* @localhost:6514;RSYSLOG_SyslogProtocol23Format
+*.* @localhost:6514;RSYSLOG_SyslogProtocol23Format

states/time/config.sls

@@ -3,10 +3,10 @@
 time-ntp-config-file:
   file.managed:
     - name: /etc/ntp.conf
-    - source: salt://time/ntp.conf.j2
+    - source: salt://time/templates/ntp.conf.j2
     - user: root
     - group: root
     - mode: 644
     - template: jinja
     - watch_in:
-      - service: ntp-service
+      - service: ntp-service

states/time/templates/ntp.conf.j2

@@ -6,4 +6,4 @@ restrict -6 default kod nomodify notrap nopeer noquery
 restrict 127.0.0.1
 restrict ::1
 server {{ time.server }} iburst
-driftfile /var/lib/ntp/drift
+driftfile /var/lib/ntp/drift

states/zsh/config.sls

@@ -22,7 +22,7 @@ zsh-omz-env-old:
 zsh-omz-env:
   file.managed:
     - name: /etc/zsh/zshenv
-    - source: salt://zsh/zshenv.j2
+    - source: salt://zsh/templates/zshenv.j2
     - user: root
     - group: root
     - mode: 0644