From b84e43bd940fe0d62ec0aef3ee8d58c4158937f9 Mon Sep 17 00:00:00 2001 From: Imran Zaman Date: Thu, 15 Jan 2015 17:38:39 +0200 Subject: [PATCH] Added separate configuration file Tizen IVI Newly created users are added to weston-launch group for Tizen IVI Signed-off-by: Imran Zaman --- .gitignore | 2 +- Makefile.am | 2 +- configure.ac | 5 +- data/Makefile.am | 7 ++ {src/daemon => data}/gumd.conf.in | 0 .../tizen/etc/gumd/gumd-tizen-common.conf | 0 data/tizen/etc/gumd/gumd-tizen-ivi.conf | 137 +++++++++++++++++++++ dists/debian/changelog | 7 ++ dists/rpm/gum-suse.spec | 6 +- dists/rpm/tizen/packaging/gumd.changes | 4 + dists/rpm/tizen/packaging/gumd.spec | 13 +- src/daemon/Makefile.am | 6 - 12 files changed, 174 insertions(+), 15 deletions(-) create mode 100644 data/Makefile.am rename {src/daemon => data}/gumd.conf.in (100%) rename dists/rpm/tizen/packaging/gumd-tizen.conf => data/tizen/etc/gumd/gumd-tizen-common.conf (100%) create mode 100644 data/tizen/etc/gumd/gumd-tizen-ivi.conf diff --git a/.gitignore b/.gitignore index a9bca22..e1735c2 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,7 @@ m4/lt*.m4 *.gcda build-aux *dbus*gen* -src/daemon/gumd.conf +data/gumd.conf src/daemon/gumd src/daemon/dbus/gumd-dbus.conf test/common/commontest diff --git a/Makefile.am b/Makefile.am index 6b268ce..08aa070 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS += \ --enable-gtk-doc endif -SUBDIRS = src test docs +SUBDIRS = src data test docs EXTRA_DIST = dists tools diff --git a/configure.ac b/configure.ac index c14e98b..050353d 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.60]) -AC_INIT([gumd], [1.0.3],[],[],[https://github.com/01org/gumd]) +AC_INIT([gumd], [1.0.4],[],[],[https://github.com/01org/gumd]) AC_CONFIG_SRCDIR([src/daemon/main.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([build-aux]) @@ -304,12 +304,13 @@ src/daemon/Makefile src/daemon/core/Makefile src/daemon/dbus/Makefile src/daemon/dbus/services/org.tizen.SecurityAccounts.gUserManagement.service -src/daemon/gumd.conf src/daemon/dbus/gumd-dbus.conf src/lib/Makefile src/lib/libgum.pc src/lib/libgum-uninstalled.pc src/utils/Makefile +data/Makefile +data/gumd.conf docs/Makefile docs/version.xml test/Makefile diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 0000000..1ca8c11 --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1,7 @@ +EXTRA_DIST = \ + gumd.conf.in \ + tizen + +gumdconfdir = ${sysconfdir}/gumd +gumdconf_DATA = gumd.conf + diff --git a/src/daemon/gumd.conf.in b/data/gumd.conf.in similarity index 100% rename from src/daemon/gumd.conf.in rename to data/gumd.conf.in diff --git a/dists/rpm/tizen/packaging/gumd-tizen.conf b/data/tizen/etc/gumd/gumd-tizen-common.conf similarity index 100% rename from dists/rpm/tizen/packaging/gumd-tizen.conf rename to data/tizen/etc/gumd/gumd-tizen-common.conf diff --git a/data/tizen/etc/gumd/gumd-tizen-ivi.conf b/data/tizen/etc/gumd/gumd-tizen-ivi.conf new file mode 100644 index 0000000..71c4463 --- /dev/null +++ b/data/tizen/etc/gumd/gumd-tizen-ivi.conf @@ -0,0 +1,137 @@ +# +# gumd Configuration file. +# + +# +# This group contains top-level settings. +# +[General] + +# Primary group name for the new user. If the primary group does not +# exist, it will be created otherwise user gid will be set accordingly. +# Default primary group name is same as name of the user. +USR_PRIMARY_GRPNAME=users + +# Comma separate listed of groups, which every user (other than system user) +# will be added to at the time of user account creation. Default value is: +# '' +DEFAULT_USR_GROUPS=weston-launch + +# Comma separate listed of groups, which admin user will be added to at the +# time of user account creation. Default value is: '' +#DEFAULT_ADMIN_GROUPS= + +# Path to passwd file which represents user information. Default is +# /etc/passwd. More information about the file format can be read at the +# manpages for 'passwd'. +# Can be overriden in debug builds by setting UM_PASSWD_FILE +# environment variable. +#PASSWD_FILE=/etc/passwd + +# Path to shadow file which represents user shadowed password information. +# Default is /etc/shadow. More information about the file format can be read +# at the manpages for 'shadow'. +# Can be overriden in debug builds by setting UM_SHADOW_FILE +# environment variable. +#SHADOW_FILE=/etc/shadow + +# Path to group file which represents group information. Default is /etc/group. +# More information about the file format can be read at the manpages for +# 'group'. +# Can be overriden in debug builds by setting UM_GROUP_FILE +# environment variable. +#GROUP_FILE=/etc/group + +# Path to group file which represents shadowed group information. +# Default is /etc/gshadow. More information about the file format can be read +# at the manpages for 'gshadow'. +# Can be overriden in debug builds by setting UM_GSHADOW_FILE +# environment variable. +#GSHADOW_FILE=/etc/gshadow + +# Prefix to be used when creating home directory for the user. For example, +# with prefix '/home', user 'newu' home directory will be created as +# '/home/newu'. Default value is '/home' +# Can be overriden in debug builds by setting UM_HOMEDIR_PREFIX +# environment variable. +#HOME_DIR=/home + +# Path to user shell executable. Default value is '/bin/bash' +#SHELL=/bin/bash + +# Path to skeleton folder. When new users are created, contents of the skel +# folder is copied to user home directory. Default value is '/etc/skel' +# Can be overriden in debug builds by setting UM_SKEL_DIR +# environment variable. +#SKEL_DIR=/etc/skel + +# Minimum value for the automatic uid selection. Default value is: 2000 +#UID_MIN=2000 + +# Maximum value for the automatic uid selection. Default value is: 60000 +#UID_MAX=60000 + +# Minimum value for the automatic uid selection for system user. Default +# value is: 200 +#SYS_UID_MIN=200 + +# Maximum value for the automatic uid selection for system user. Default value +# is: 999 +#SYS_UID_MAX=999 + +# Minimum value for the automatic gid selection. Default value is: 2000 +#GID_MIN=2000 + +# Maximum value for the automatic gid selection. Default value is: 60000 +#GID_MAX=60000 + +# Minimum value for the automatic gid selection for system user. Default value +# is: 200 +#SYS_GID_MIN=200 + +# Maximum value for the automatic gid selection for system user. Default value +# is: 999 +#SYS_GID_MAX=999 + +# Minimum number of days a password may be used. Default value is: 0 +#PASS_MIN_DAYS=0 + +# Maximum number of days allowed between password changes. Default value is: +# 99999 +#PASS_MAX_DAYS=99999 + +# Number of days warning given before a password expires. Default value is: +# 7 +#PASS_WARN_AGE=7 + +# Value used to set the mode of home directories created for new users. +# Default value is: 022 +#UMASK=022 + +# Value used to set the encryption algorithm. Default +# value is: 'SHA512' (other supported options are: 'MD5', 'SHA256', 'DES') +#ENCRYPT_METHOD=SHA512 + +# Value used to set the smack label for newly created files and folders. +SMACK64_NEW_FILES=_ + +# Value used to set the smack label for User files and folders. +SMACK64_USER_FILES=User + +# +# D-Bus related settings. +# +[ObjectTimeouts] + +# Timeout in seconds for the daemon. Daemon will exit after specified idle time. +# If not set (or set to 0), the daemon will not exit. Has no effect if P2P DBus +# is in use. +#DAEMON_TIMEOUT=7 + +# Timeout in seconds for user dbus objects. If not set (or set to 0), the dbus +# objects will persist +#USER_TIMEOUT=5 + +# Timeout in seconds for group dbus objects. If not set (or set to 0), the dbus +# objects will persist +#GROUP_TIMEOUT=5 diff --git a/dists/debian/changelog b/dists/debian/changelog index c76bc1f..b92c896 100644 --- a/dists/debian/changelog +++ b/dists/debian/changelog @@ -1,3 +1,10 @@ +gumd (1.0.4-0) unstable; urgency=low + + * Added separate configuration file Tizen IVI + * Newly created users are added to weston-launch group for Tizen IVI + + -- Imran Zaman Thu, 15 Jan 2015 18:00:00 +0300 + gumd (1.0.3-0) unstable; urgency=low * Updated inputs for scripts e.g. usertype to useradd script diff --git a/dists/rpm/gum-suse.spec b/dists/rpm/gum-suse.spec index 0c3f256..582b6c7 100644 --- a/dists/rpm/gum-suse.spec +++ b/dists/rpm/gum-suse.spec @@ -7,7 +7,7 @@ Name: gumd Summary: User management daemon and client library -Version: 1.0.2 +Version: 1.0.4 Release: 0 Group: System/Daemons License: LGPL-2.1+ @@ -150,6 +150,10 @@ mkdir -p %{_sysconfdir}/%{name}/groupdel.d %changelog +* Thu Jan 15 2015 Imran Zaman +- Added separate configuration file Tizen IVI +- Newly created users are added to weston-launch group for Tizen IVI + * Thu Nov 27 2014 Imran Zaman - Updated inputs for scripts e.g. usertype to useradd script diff --git a/dists/rpm/tizen/packaging/gumd.changes b/dists/rpm/tizen/packaging/gumd.changes index df22abe..d61e008 100644 --- a/dists/rpm/tizen/packaging/gumd.changes +++ b/dists/rpm/tizen/packaging/gumd.changes @@ -1,3 +1,7 @@ +* Thu Jan 15 2015 Imran Zaman +- Added separate configuration file Tizen IVI +- Newly created users are added to weston-launch group for Tizen IVI + * Thu Nov 27 2014 Imran Zaman - Updated inputs for scripts e.g. usertype to useradd script diff --git a/dists/rpm/tizen/packaging/gumd.spec b/dists/rpm/tizen/packaging/gumd.spec index e0f93c0..4c3be03 100644 --- a/dists/rpm/tizen/packaging/gumd.spec +++ b/dists/rpm/tizen/packaging/gumd.spec @@ -6,7 +6,7 @@ Name: gumd Summary: User management daemon and client library -Version: 1.0.3 +Version: 1.0.4 Release: 0 Group: Security/Accounts License: LGPL-2.1+ @@ -14,7 +14,6 @@ URL: https://github.com/01org/gumd Source: %{name}-%{version}.tar.gz Source1001: %{name}.manifest Source1002: libgum.manifest -Source1003: %{name}-tizen.conf Requires: libgum = %{version}-%{release} Conflicts: gum %if %{dbus_type} != "p2p" @@ -92,7 +91,14 @@ cp -a %{SOURCE1002} libgum.manifest %install rm -rf %{buildroot} %make_install -cp -a %{SOURCE1003} %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf +rm -f %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf +install -m 755 -d %{buildroot}%{_sysconfdir}/%{name} + +%if "%{profile}" != "ivi" +install -m 644 data/tizen/etc/%{name}/%{name}-tizen-common.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf +%else +install -m 644 data/tizen/etc/%{name}/%{name}-tizen-ivi.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf +%endif %post ldconfig @@ -133,7 +139,6 @@ mkdir -p %{_sysconfdir}/%{name}/groupdel.d %manifest %{name}.manifest %doc AUTHORS COPYING.LIB NEWS README %{_bindir}/%{name} -%dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %if %{dbus_type} == "system" %dir %{_datadir}/dbus-1/system-services diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index a0077bc..d6a3d7c 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -20,12 +20,6 @@ gumd_LDADD = \ $(GUMD_LIBS) \ $(NULL) -EXTRA_DIST = \ - gumd.conf.in - -gumdconfdir = ${sysconfdir}/gumd -gumdconf_DATA = gumd.conf - if SET_PERMISSIONS install-exec-hook: chown root $(DESTDIR)$(bindir)/gumd || true -- 2.7.4