Page MenuHomeDevCentral
Files F3780495

D2135.id5382.diff
No OneTemporary
Actions

D2135.id5382.diff
View Options

diff --git a/_tests/pillar/core/test_users.py b/_tests/pillar/core/test_users.py
--- a/_tests/pillar/core/test_users.py
+++ b/_tests/pillar/core/test_users.py
@@ -6,6 +6,7 @@
USER_PROPERTIES_MANDATORY = set(["fullname", "ssh_keys", "uid"])
USER_PROPERTIES_OPTIONAL = set([
+ "class",
"shell",
"yubico_keys",
"deploy_dotfiles_to_devserver"
diff --git a/roles/core/init.sls b/roles/core/init.sls
--- a/roles/core/init.sls
+++ b/roles/core/init.sls
@@ -8,6 +8,7 @@
include:
- .rc
- .hostname
+ - .login
- .network
- .motd
- .rsyslog
diff --git a/roles/core/login/files/login.conf b/roles/core/login/files/login.conf
new file mode 100644
--- /dev/null
+++ b/roles/core/login/files/login.conf
@@ -0,0 +1,97 @@
+# -------------------------------------------------------------
+# Login class capabilities database
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# Created: 2020-01-20
+# License: Trivial work, not eligible to copyright
+# Based on: FreeBSD releng/12.1/usr.bin/login/login.conf
+# VCS info: 338399 2018-08-30 15:52:03Z brd
+# Source file: roles/core/login/files/login.conf
+# -------------------------------------------------------------
+#
+# <auto-generated>
+# This file is managed by our rOPS SaltStack repository.
+#
+# Changes to this file may cause incorrect behavior
+# and will be lost if the state is redeployed.
+# </auto-generated>
+
+# -------------------------------------------------------------
+# Default settings
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+default:\
+ :passwd_format=sha512:\
+ :copyright=/etc/COPYRIGHT:\
+ :welcome=/etc/motd:\
+ :setenv=MAIL=/var/mail/$,BLOCKSIZE=K:\
+ :path=/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin ~/bin:\
+ :nologin=/var/run/nologin:\
+ :cputime=unlimited:\
+ :datasize=unlimited:\
+ :stacksize=unlimited:\
+ :memorylocked=64K:\
+ :memoryuse=unlimited:\
+ :filesize=unlimited:\
+ :coredumpsize=unlimited:\
+ :openfiles=unlimited:\
+ :maxproc=unlimited:\
+ :sbsize=unlimited:\
+ :vmemoryuse=unlimited:\
+ :swapuse=unlimited:\
+ :pseudoterminals=unlimited:\
+ :kqueues=unlimited:\
+ :umtxp=unlimited:\
+ :priority=0:\
+ :ignoretime@:\
+ :umask=022:
+
+# -------------------------------------------------------------
+# Common class names to forward to 'default'
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+standard:\
+ :tc=default:
+xuser:\
+ :tc=default:
+staff:\
+ :tc=default:
+daemon:\
+ :memorylocked=128M:\
+ :tc=default:
+news:\
+ :tc=default:
+dialer:\
+ :tc=default:
+
+# -------------------------------------------------------------
+# Root class
+#
+# Root can always login.
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+root:\
+ :ignorenologin:\
+ :memorylocked=unlimited:\
+ :tc=default:
+
+# -------------------------------------------------------------
+# Users classes
+#
+# Provide proper UTF-8 environment
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+english|English Users Accounts:\
+ :charset=UTF-8:\
+ :lang=en_US.UTF-8:\
+ :tc=default:
+
+french|French Users Accounts:\
+ :charset=UTF-8:\
+ :lang=fr_FR.UTF-8:\
+ :tc=default:
+
+russian|Russian Users Accounts:\
+ :charset=UTF-8:\
+ :lang=ru_RU.UTF-8:\
+ :tc=default:
diff --git a/roles/core/login/init.sls b/roles/core/login/init.sls
new file mode 100644
--- /dev/null
+++ b/roles/core/login/init.sls
@@ -0,0 +1,23 @@
+# -------------------------------------------------------------
+# Set login capabilities
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# Created: 2020-01-20
+# License: Trivial work, not eligible to copyright
+# -------------------------------------------------------------
+
+{% if grains['os'] == 'FreeBSD' %}
+
+/etc/login.conf:
+ file.managed:
+ - source: salt://roles/core/login/files/login.conf
+ - template: jinja
+ - file_mode: 644
+
+compile_login_db:
+ cmd.run:
+ - name: cap_mkdb /etc/login.config
+ - onchanges:
+ - file: /etc/login.conf
+
+{% endif %}
diff --git a/roles/core/users/init.sls b/roles/core/users/init.sls
--- a/roles/core/users/init.sls
+++ b/roles/core/users/init.sls
@@ -87,6 +87,7 @@
- fullname: {{ user['fullname'] }}
- shell: {{ shells[user['shell']|default('bash')] }}
- uid: {{ user['uid'] }}
+ - loginclass: {{ shells[user['class']|default('english')] }}
{% endfor %}
# -------------------------------------------------------------

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 26, 14:45 (20 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2264728
Default Alt Text
D2135.id5382.diff (4 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator