bundles/locale/items.py

@@ -1,15 +1,8 @@
-default_locale = node.metadata.get('locale/default')[0]
+locale = node.metadata.get('locale')
-
-installed_locales = sorted([
-    node.metadata.get('locale/default'),
-    *node.metadata.get('locale/installed'),
-])
 
 files = {
     '/etc/locale.gen': {
-        'content': '\n'.join(
+        'content': f"{locale} {locale.split('.')[1]}\n",
-            f'{locale} {type}' for locale, type in installed_locales
-        ),
         'triggers': {
             'action:locale-gen',
         },
@@ -22,8 +15,8 @@ actions = {
         'triggered': True,
     },
     'systemd-locale': {
-        'command': f'localectl set-locale LANG="{default_locale}"',
+        'command': f'localectl set-locale LANG="{locale}"',
-        'unless': f'localectl | grep -Fi "system locale" | grep -Fi "{default_locale}"',
+        'unless': f'localectl | grep -Fi "system locale" | grep -Fi "{locale}"',
         'preceded_by': {
             'action:locale-gen',
         },

bundles/locale/metadata.py

@@ -4,16 +4,5 @@ defaults = {
             'locales': {},
         },
     },
-    'locale': {
+    'locale': 'en_US.UTF-8',
-        'default': ('en_US.UTF-8', 'UTF-8'),
-        'installed': {
-            ('de_AT.UTF-8', 'UTF-8'),
-            ('de_CH.UTF-8', 'UTF-8'),
-            ('de_DE.UTF-8', 'UTF-8'),
-            ('de_LU.UTF-8', 'UTF-8'),
-            ('en_CA.UTF-8', 'UTF-8'),
-            ('en_GB.UTF-8', 'UTF-8'),
-            ('en_US.UTF-8', 'UTF-8'),
-        },
-    },
 }

bundles/ssh/files/sshd_config

@@ -17,5 +17,5 @@ PermitTTY yes
 TCPKeepAlive yes
 ClientAliveInterval 30
 ClientAliveCountMax 5
-AcceptEnv LANG
+AcceptEnv LANG LC_*
 Subsystem	sftp	/usr/lib/openssh/sftp-server