diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2011-07-17 12:32:37 +1000 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2011-07-17 12:32:37 +1000 |
| commit | 58ac0b5b5741aaf0ae67923e5fc4335d09a2d424 (patch) | |
| tree | 30cddff0599e59a9b312b039d3e22085fc75d383 /data | |
| parent | 7e213ebf76a1af2db55ed98b52ee4515f6a78c81 (diff) | |
| download | lightdm-58ac0b5b5741aaf0ae67923e5fc4335d09a2d424.tar.gz | |
Split the user accounts configuration into /etc/lightdm/users.conf so the main config can be private
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/lightdm.conf | 18 | ||||
| -rw-r--r-- | data/users.conf | 11 |
3 files changed, 15 insertions, 16 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 70386aa9..7884535e 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = init confdir = $(sysconfdir)/lightdm -dist_conf_DATA = lightdm.conf +dist_conf_DATA = lightdm.conf users.conf dbusconfdir = $(sysconfdir)/dbus-1/system.d dist_dbusconf_DATA = org.freedesktop.DisplayManager.conf diff --git a/data/lightdm.conf b/data/lightdm.conf index 4e3ed71d..e6a3eb58 100644 --- a/data/lightdm.conf +++ b/data/lightdm.conf @@ -31,11 +31,13 @@ seats=Seat0 # xdmcp-port = XDMCP UDP/IP port to communicate on # #[SeatDefaults] -#xserver-command=/usr/bin/X +#xserver-command=X #xserver-layout= #xserver-config= #xserver-key=0x0123456789ABCD #greeter-theme=example-gtk-gnome +#greeter-background= +#greeter-show-user-list=true #xsession=gnome #xsession-wrapper= #autologin-guest=false @@ -52,20 +54,6 @@ seats=Seat0 #[Seat0] # -# User manager configuration -# -# load-users = True if can provide user list to greeter -# minimum-uid = Minimum UID required to be shown in greeter -# hidden-users = Users that are not shown to the user -# hidden-shells = Shells that indicate a user cannot login -# -[UserManager] -#load-users=true -#minimum-uid=500 -#hidden-users=nobody nobody4 noaccess -#hidden-shells=/bin/false /usr/sbin/nologin - -# # Guest account configuration # # enabled = True if guest account is enabled diff --git a/data/users.conf b/data/users.conf new file mode 100644 index 00000000..5b82c7be --- /dev/null +++ b/data/users.conf @@ -0,0 +1,11 @@ +# +# User accounts configuration +# +# minimum-uid = Minimum UID required to be shown in greeter +# hidden-users = Users that are not shown to the user +# hidden-shells = Shells that indicate a user cannot login +# +[UserAccounts] +minimum-uid=500 +hidden-users=nobody nobody4 noaccess +hidden-shells=/bin/false /usr/sbin/nologin |