add limits.conf and update databag

Change-Id: I9c5ec9f3470a1a5013c03e6f8f109c4187da4cf3
This commit is contained in:
xiaodongwang 2014-02-20 11:41:17 -08:00
parent 49e31e249c
commit c2eb072c59
4 changed files with 60 additions and 3 deletions

View File

@ -70,7 +70,7 @@
},
"text" : true
},
"dashboard_roles" : [ "os-single-controller" ],
"dashboard_roles" : [ "os-single-controller", "os-dashboard" ],
"db" : { "mysql" : { "bind_address" : "10.145.88.231",
"port" : "3306"
},

View File

@ -67,7 +67,7 @@ reboot
%pre
$SNIPPET('log_ks_pre')
$kickstart_start
$SNIPPET('kickstart_start')
$SNIPPET('pre_install_network_config')
# Enable installation monitoring
$SNIPPET('pre_anamon')
@ -110,6 +110,10 @@ cat << EOF > /etc/ntp.conf
$SNIPPET('ntp.conf')
EOF
cat << EOF > /etc/security/limits.conf
$SNIPPET('limits.conf')
EOF
## $yum_repo_stanza
## $yum_config_stanza

View File

@ -65,7 +65,7 @@ echo "new date is: \`date\`" 2>&1 >> /tmp/ntp.log
#end if
chmod +x /etc/chef/rerun.sh
/etc/chef/rerun.sh
/etc/chef/rerun.sh &
crontab -l > mycron
echo "*/30 * * * * /etc/chef/rerun.sh" >> mycron

View File

@ -0,0 +1,53 @@
# /etc/security/limits.conf
#
#Each line describes a limit for a user in the form:
#
#<domain> <type> <item> <value>
#
#Where:
#<domain> can be:
# - an user name
# - a group name, with @group syntax
# - the wildcard *, for default entry
# - the wildcard %, can be also used with %group syntax,
# for maxlogin limit
#
#<type> can have the two values:
# - "soft" for enforcing the soft limits
# - "hard" for enforcing hard limits
#
#<item> can be one of the following:
# - core - limits the core file size (KB)
# - data - max data size (KB)
# - fsize - maximum filesize (KB)
# - memlock - max locked-in-memory address space (KB)
# - nofile - max number of open files
# - rss - max resident set size (KB)
# - stack - max stack size (KB)
# - cpu - max CPU time (MIN)
# - nproc - max number of processes
# - as - address space limit (KB)
# - maxlogins - max number of logins for this user
# - maxsyslogins - max number of logins on the system
# - priority - the priority to run user process with
# - locks - max number of file locks the user can hold
# - sigpending - max number of pending signals
# - msgqueue - max memory used by POSIX message queues (bytes)
# - nice - max nice priority allowed to raise to values: [-20, 19]
# - rtprio - max realtime priority
#
#<domain> <type> <item> <value>
#
#raw
#* soft core 0
#* hard rss 10000
#@student hard nproc 20
#@faculty soft nproc 20
#@faculty hard nproc 50
#ftp hard nproc 0
#@student - maxlogins 4
* - nofile 100000
#end raw
# End of file