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/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/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/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

states/docker/config.sls

@@ -7,7 +7,7 @@ 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:

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

states/git/defaults.yaml

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

states/git/init.sls

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

states/gitea/config.sls

@@ -5,7 +5,7 @@
 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

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/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/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

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/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

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/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,7 +3,7 @@
 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

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/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/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/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

states/rsyslog/config.sls

@@ -2,7 +2,7 @@
 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

states/time/config.sls

@@ -3,7 +3,7 @@
 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

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