resending (wrong subject) This patch changes cgconfig.conf - comment all rows and rename example values - to have example which should be installed to /etc/. Move cgred to /etc/sysconfig and patch spec to install all /etc/* configuration files (at least they shows examples and help to user to do their own configuration).).
Signed-off-by: Ivana Varekova <[email protected]> Ivana Varekova -------------------------------------------------------- diff -up ./libcgroup.spec.in.ppp ./libcgroup.spec.in --- ./libcgroup.spec.in.ppp 2009-02-23 09:34:06.000000000 +0100 +++ ./libcgroup.spec.in 2009-02-23 13:08:28.000000000 +0100 @@ -41,7 +41,10 @@ make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT/%{_initrddir} cp scripts/init.d/cgconfig $RPM_BUILD_ROOT/%{_initrddir}/cgconfig cp scripts/init.d/cgred $RPM_BUILD_ROOT/%{_initrddir}/cgred - +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig +cp samples/cgred.conf $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cgred.conf +cp samples/cgconfig.conf $RPM_BUILD_ROOT/%{_sysconfdir}/cgconfig.conf +cp samples/cgrules.conf $RPM_BUILD_ROOT/%{_sysconfdir}/cgrules.conf %clean rm -rf $RPM_BUILD_ROOT @@ -63,6 +66,9 @@ fi %files %defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/sysconfig/cgred.conf +%config(noreplace) %{_sysconfdir}/cgconfig.conf +%config(noreplace) %{_sysconfdir}/cgrules.conf %{_libdir}/libcgroup-%{version}.so %{_libdir}/libcgroup.so.* %{_bindir}/cgexec diff -up ./README_daemon.ppp ./README_daemon --- ./README_daemon.ppp 2009-02-23 09:08:48.000000000 +0100 +++ ./README_daemon 2009-02-23 13:10:42.000000000 +0100 @@ -54,7 +54,7 @@ was already started), and status (print stopped) commands are also supported. An additional command, "flash", allows you to reload the configuration file without stopping the daemon. /etc/init.d/cgred flash -The cgred script automatically loads configuration from /etc/cgred.d/cgred.conf, +The cgred script automatically loads configuration from /etc/sysconfig/cgred.conf, which is shipped as samples/cgred.conf. See that file for more information. If you choose not to run the daemon as a service, the following options are diff -up ./samples/cgconfig.conf.ppp ./samples/cgconfig.conf --- ./samples/cgconfig.conf.ppp 2009-02-23 09:08:48.000000000 +0100 +++ ./samples/cgconfig.conf 2009-02-23 11:13:15.000000000 +0100 @@ -10,46 +10,39 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # -# controller file +#group daemons/www { +# perm { +# task { +# uid = root; +# gid = webmaster; +# } +# admin { +# uid = root; +# gid = root; +# } +# } +# cpu { +# cpu.shares = 1000; +# } +#} # - -group ca1 { - perm { - task { - uid = root; - gid = root; - } - admin { - uid = root; - gid = root; - } - } - - cpu { - cpu.shares = 500; - } - -} - -group db { - perm { - task { - uid = balbir; - gid = balbir; - } - admin { - uid = balbir; - gid = balbir; - } - } - - cpu { - cpu.shares = 500; - } - -} - -mount { - cpu = /tmp/cpu; - cpuacct = /tmp/cpuacct; -} +#group daemons/ftp { +# perm { +# task { +# uid = root; +# gid = ftpmaster; +# } +# admin { +# uid = root; +# gid = root; +# } +# } +# cpu { +# cpu.shares = 500; +# } +#} +# +#mount { +# cpu = /mnt/cgroups/cpu; +# cpuacct = /mnt/cgroups/cpuacct; +#} diff -up ./samples/cgred.conf.ppp ./samples/cgred.conf --- ./samples/cgred.conf.ppp 2009-02-23 09:08:48.000000000 +0100 +++ ./samples/cgred.conf 2009-02-23 13:11:05.000000000 +0100 @@ -1,4 +1,4 @@ -# /etc/cgred.d/cgred.conf - CGroup Rules Engine Daemon configuration file +# /etc/sysconfig/cgred.conf - CGroup Rules Engine Daemon configuration file # # The four options listed below (CONFIG_FILE, LOG_FILE, NODAEMON, LOG) are # the only valid ones. Defining anything else in this file will cause the diff -up ./scripts/init.d/cgred.ppp ./scripts/init.d/cgred --- ./scripts/init.d/cgred.ppp 2009-02-23 10:03:15.000000000 +0100 +++ ./scripts/init.d/cgred 2009-02-23 13:12:03.000000000 +0100 @@ -46,8 +46,8 @@ CGRED_BIN=${exec_prefix}/${bindir}/cgrul . /lib/lsb/init-functions # Read in configuration options. -if [ -f "/etc/cgred.d/cgred.conf" ] ; then - . /etc/cgred.d/cgred.conf +if [ -f "/etc/sysconfig/cgred.conf" ] ; then + . /etc/sysconfig/cgred.conf OPTIONS="$NODAEMON $LOG" if [ -n "$LOG_FILE" ]; then OPTIONS="$OPTIONS --log-file=$LOG_FILE" ------------------------------------------------------------------------------ Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H _______________________________________________ Libcg-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/libcg-devel
