Rename xlocal seat to local - it supports Mir and Wayland as well as X. The xlocal...

[sojka/lightdm.git] / data / lightdm.conf

diff --git a/data/lightdm.conf b/data/lightdm.conf
index 5c4b598826c664188534dea34725c8e346092844..72d1f0bbef3c837a0e79cf52531a139abcdc09a9 100644 (file)
--- a/data/lightdm.conf
+++ b/data/lightdm.conf
@@ -15,6 +15,7 @@
 # sessions-directory = Directory to find sessions
 # remote-sessions-directory = Directory to find remote sessions
 # greeters-directory = Directory to find greeters
+# backup-logs = True to move add a .old suffix to old log files when opening new ones
 #
 [LightDM]
 #start-default-seat=true
@@ -28,24 +29,28 @@
 #log-directory=/var/log/lightdm
 #run-directory=/var/run/lightdm
 #cache-directory=/var/cache/lightdm
-#sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions
+#sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions
 #remote-sessions-directory=/usr/share/lightdm/remote-sessions
 #greeters-directory=/usr/share/lightdm/greeters:/usr/share/xgreeters
+#backup-logs=true
 
 #
-# Seat defaults
+# Seat configuration
 #
-# PLEASE NOTE: [SeatDefaults] section is deprecated and won't be supported in the future.
-#              Users are encouraged to update their lightdm.conf files, using [Seat:*] instead.
+# Seat configuration is matched against the seat name glob in the section, for example:
+# [Seat:*] matches all seats and is applied first.
+# [Seat:seat0] matches the seat named "seat0".
+# [Seat:seat-thin-client*] matches all seats that have names that start with "seat-thin-client".
 #
-# type = Seat type (xlocal, xremote)
+# type = Seat type (local, xremote, unity)
 # pam-service = PAM service to use for login
 # pam-autologin-service = PAM service to use for autologin
 # pam-greeter-service = PAM service to use for greeters
+# xserver-backend = X backend to use (mir)
 # xserver-command = X server command to run (can also contain arguments e.g. X -special-option)
 # xmir-command = Xmir server command to run (can also contain arguments e.g. Xmir -special-option)
-# xserver-layout = Layout to pass to X server
 # xserver-config = Config file to pass to X server
+# xserver-layout = Layout to pass to X server
 # xserver-allow-tcp = True if TCP/IP connections are allowed to this X server
 # xserver-share = True if the X server is shared for both greeter and session
 # xserver-hostname = Hostname of X server (only for type=xremote)
@@ -80,14 +85,15 @@
 # exit-on-failure = True if the daemon should exit if this seat fails
 #
 [Seat:*]
-#type=xlocal
+#type=local
 #pam-service=lightdm
 #pam-autologin-service=lightdm-autologin
 #pam-greeter-service=lightdm-greeter
+#xserver-backend=
 #xserver-command=X
 #xmir-command=Xmir
-#xserver-layout=
 #xserver-config=
+#xserver-layout=
 #xserver-allow-tcp=false
 #xserver-share=true
 #xserver-hostname=
@@ -118,17 +124,9 @@
 #autologin-user=
 #autologin-user-timeout=0
 #autologin-in-background=false
-#autologin-session=UNIMPLEMENTED
+#autologin-session=
 #exit-on-failure=false
 
-#
-# Seat configuration
-#
-# Each seat must start with "Seat:".
-# Uses settings from [Seat:*], any of these can be overriden by setting them in this section.
-#
-#[Seat:0]
-
 #
 # XDMCP Server configuration
 #
@@ -136,6 +134,7 @@
 # port = UDP/IP port to listen for connections on
 # listen-address = Host/address to listen for XDMCP connections (use all addresses if not present)
 # key = Authentication key to use for XDM-AUTHENTICATION-1 or blank to not use authentication (stored in keys.conf)
+# hostname = Hostname to report to XDMCP clients (defaults to system hostname if unset)
 #
 # The authentication key is a 56 bit DES key specified in hex as 0xnnnnnnnnnnnnnn.  Alternatively
 # it can be a word and the first 7 characters are used as the key.
@@ -145,6 +144,7 @@
 #port=177
 #listen-address=
 #key=
+#hostname=
 
 #
 # VNC Server configuration