Add git, remove localization, edit noveriablcgen
This commit is contained in:
parent
0a860df1bd
commit
ab0306ba90
4 changed files with 3 additions and 38 deletions
|
@ -6,6 +6,7 @@ system_base_pkgs:
|
||||||
- openjdk17-jre-headless
|
- openjdk17-jre-headless
|
||||||
- jq
|
- jq
|
||||||
- vim
|
- vim
|
||||||
|
- git
|
||||||
|
|
||||||
system_base_bin_dir:
|
system_base_bin_dir:
|
||||||
file.directory:
|
file.directory:
|
||||||
|
|
|
@ -7,4 +7,3 @@ include:
|
||||||
- .user
|
- .user
|
||||||
- .shell
|
- .shell
|
||||||
- .salt
|
- .salt
|
||||||
- .localization
|
|
||||||
|
|
|
@ -1,35 +0,0 @@
|
||||||
# Localization
|
|
||||||
|
|
||||||
# keyboard layout
|
|
||||||
system_localization_keyboard_layout:
|
|
||||||
keyboard.system:
|
|
||||||
- name: de_CH-latin1
|
|
||||||
|
|
||||||
system_localization_vconsole_conf:
|
|
||||||
file.managed:
|
|
||||||
- name: /etc/vconsole.conf
|
|
||||||
- user: root
|
|
||||||
- group: root
|
|
||||||
- mode: '0644'
|
|
||||||
- contents: KEYMAP=de_CH-latin1
|
|
||||||
|
|
||||||
# Locale
|
|
||||||
system_localization_locale_en_us_utf:
|
|
||||||
locale.present:
|
|
||||||
- name: en_US.UTF-8 UTF-8
|
|
||||||
|
|
||||||
system_localization_locale_en_us_iso:
|
|
||||||
locale.present:
|
|
||||||
- name: en_US ISO-8859-1
|
|
||||||
|
|
||||||
system_localization_locale_de_ch_utf:
|
|
||||||
locale.present:
|
|
||||||
- name: de_CH.UTF-8 UTF-8
|
|
||||||
|
|
||||||
system_localization_locale_default:
|
|
||||||
file.managed:
|
|
||||||
- name: /etc/locale.conf
|
|
||||||
- user: root
|
|
||||||
- group: root
|
|
||||||
- mode: '0644'
|
|
||||||
- contents: 'LANG=en_US.UTF-8'
|
|
|
@ -6,7 +6,7 @@ include:
|
||||||
util_noveriablcgen_git:
|
util_noveriablcgen_git:
|
||||||
git.latest:
|
git.latest:
|
||||||
- name: https://gitlab.com/noveria/tools/noveriablcgen.git
|
- name: https://gitlab.com/noveria/tools/noveriablcgen.git
|
||||||
- target: {{ noveria.app_dir }}
|
- target: {{ noveria.app_dir }}/noveriablcgen
|
||||||
- user: root
|
- user: root
|
||||||
- require:
|
- require:
|
||||||
- system_base_apps_dir
|
- system_base_apps_dir
|
||||||
|
@ -25,7 +25,7 @@ util_noveriablcgen_link:
|
||||||
util_noveriablcgen_config:
|
util_noveriablcgen_config:
|
||||||
file.managed:
|
file.managed:
|
||||||
- name: {{ noveria.app_dir }}/noveriablcgen/noveriablcgen.json
|
- name: {{ noveria.app_dir }}/noveriablcgen/noveriablcgen.json
|
||||||
- target: salt://{{ tpldir }}/files/noveriablcgen_config.json.jinja
|
- source: salt://{{ tpldir }}/files/noveriablcgen_config.json.jinja
|
||||||
- template: jinja
|
- template: jinja
|
||||||
- context:
|
- context:
|
||||||
BTRFS_ROOT: "/btrfs"
|
BTRFS_ROOT: "/btrfs"
|
||||||
|
|
Loading…
Reference in a new issue