Ignore:
Timestamp:
Jul 9, 2009, 3:48:21 PM (13 years ago)
Author:
mitchb
Message:
Reintegrate branches/fc11-dev (r1121:1258) to trunk
Location:
trunk
Files:
2 deleted
13 edited
5 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/server/fedora/config/etc/httpd/conf/httpd.conf

    r1164 r1259  
    260260
    261261RLimitCPU 300 300
    262 RLimitMEM 536870912 536870912
     262RLimitMEM 1342177280 1342177280
    263263RLimitNPROC 4096 4096
    264264
  • trunk/server/fedora/config/etc/logrotate.d/httpd

    r180 r1259  
    66    sharedscripts
    77    postrotate
    8         /bin/kill -HUP `cat /var/run/httpd.pid 2>/dev/null` 2> /dev/null || true
     8        /bin/kill -HUP `cat /var/run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true
    99    endscript
    1010}
  • trunk/server/fedora/config/etc/munin/munin-node.conf

    r847 r1259  
    55log_level 4
    66log_file /var/log/munin/munin-node.log
    7 port 4949
    87pid_file /var/run/munin/munin-node.pid
     8
    99background 1
    1010setseid 1
    1111
    12 # Which port to bind to;
    13 host *
    1412user munin
    1513group munin
     
    2321ignore_file \.dpkg-(tmp|new|old|dist)$
    2422ignore_file \.rpm(save|new)$
     23ignore_file \.pod$
    2524
    2625# Set this if the client doesn't report the correct hostname when
    2726# telnetting to localhost, port 4949
    2827#
    29 #host_name ppc2.fedora.redhat.com
     28#host_name x86-3.fedora.phx.redhat.com
    3029
    3130# A list of addresses that are allowed to connect.  This must be a
     
    3736allow ^18\.187\.1\.128$
    3837allow ^18\.181\.0\.65$
     38
     39# Which address to bind to;
     40host *
     41# host 127.0.0.1
     42
     43# And which port
     44port 4949
     45
  • trunk/server/fedora/config/etc/munin/plugin-conf.d/munin-node

    r865 r1259  
     1# This file is used to configure how the plugins are invoked.
     2# Place in /etc/munin/plugin-conf.d/ or corresponding directory.
    13#
    2 # This file contains configuration options for the plugins. Three
    3 # options are understood by munin-node itself:
     4# PLEASE NOTE: Changes in the plugin-conf.d directory are only
     5# read at munin-node startup, so restart at any changes.
    46#
    5 #       user <user>         # Set the user to run the plugin as
    6 #       group <group>       # Set the group to run the plugin as
    7 #       command <command>   # Run <command> instead of the plugin. %c
    8 #                             expands to what would normally be run.
    9  env.<variable>      # Sets <variable> in the plugin's environment, see the
    10 #                         individual plugins to find out which variables they
    11 #                         care about.
     7#  user <user>         # Set the user to run the plugin as
     8#  group <group>       # Set the group to run the plugin as
     9#  command <command>   # Run <command> instead of the plugin. %c
     10#                        expands to what would normally be run.
     11env.<variable> <value> # Sets <variable> in the plugin's environment, see the
     12#                        individual plugins to find out which variables they
     13#                        care about.
    1214#
    1315#
  • trunk/server/fedora/config/etc/nagios/nrpe.cfg

    r982 r1259  
    33# Written by: Ethan Galstad (nagios@nagios.org)
    44#
    5 # Last Modified: 02-23-2006
     5# Last Modified: 11-23-2007
    66#
    77# NOTES:
     
    1212
    1313
     14# LOG FACILITY
     15# The syslog facility that should be used for logging purposes.
     16
     17log_facility=daemon
     18
     19
     20
    1421# PID FILE
    1522# The name of the file in which the NRPE daemon should write it's process ID
     
    3542# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
    3643
    37 #server_address=192.168.1.1
     44#server_address=127.0.0.1
    3845
    3946
     
    4552# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
    4653
    47 nrpe_user=nagios
     54nrpe_user=nrpe
    4855
    4956
     
    5562# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
    5663
    57 nrpe_group=nagios
     64nrpe_group=nrpe
    5865
    5966
     
    125132
    126133command_timeout=60
     134
     135
     136
     137# CONNECTION TIMEOUT
     138# This specifies the maximum number of seconds that the NRPE daemon will
     139# wait for a connection to be established before exiting. This is sometimes
     140# seen where a network problem stops the SSL being established even though
     141# all network sessions are connected. This causes the nrpe daemons to
     142# accumulate, eating system resources. Do not set this too low.
     143
     144connection_timeout=300
    127145
    128146
     
    176194# examples only!
    177195
     196
    178197# The following examples use hardcoded command arguments...
    179198
    180199#command[check_users]=/usr/lib64/nagios/plugins/check_users -w 5 -c 10
    181200#command[check_load]=/usr/lib64/nagios/plugins/check_load -w 15,10,5 -c 30,25,20
    182 #command[check_disk1]=/usr/lib64/nagios/plugins/check_disk -w 20 -c 10 -p /dev/hda1
    183 #command[check_disk2]=/usr/lib64/nagios/plugins/check_disk -w 20 -c 10 -p /dev/hdb1
     201#command[check_hda1]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /dev/hda1
    184202#command[check_zombie_procs]=/usr/lib64/nagios/plugins/check_procs -w 5 -c 10 -s Z
    185203#command[check_total_procs]=/usr/lib64/nagios/plugins/check_procs -w 150 -c 200
     204
    186205
    187206# The following examples allow user-supplied arguments and can
    188207# only be used if the NRPE daemon was compiled with support for
    189208# command arguments *AND* the dont_blame_nrpe directive in this
    190 # config file is set to '1'...
     209# config file is set to '1'.  This poses a potential security risk, so
     210# make sure you read the SECURITY file before doing this.
    191211
    192212command[check_users]=/usr/lib64/nagios/plugins/check_users -w $ARG1$ -c $ARG2$
  • trunk/server/fedora/config/etc/nscd.conf

    r879 r1259  
    3535        max-threads             128
    3636        server-user             nscd
    37 #       stat-user               nocpulse
     37#       stat-user               somebody
    3838        debug-level             0
    3939#31
  • trunk/server/fedora/config/etc/printcap

    r39 r1259  
     1# This file was automatically generated by cupsd(8) from the
     2# /etc/cups/printers.conf file.  All changes to this file
     3# will be lost.
  • trunk/server/fedora/config/etc/security/limits.conf

    r1165 r1259  
    2727#        - cpu - max CPU time (MIN)
    2828#        - nproc - max number of processes
    29 #        - as - address space limit
     29#        - as - address space limit (KB)
    3030#        - maxlogins - max number of logins for this user
    3131#        - maxsyslogins - max number of logins on the system
     
    3434#        - sigpending - max number of pending signals
    3535#        - msgqueue - max memory used by POSIX message queues (bytes)
    36 #        - nice - max nice priority allowed to raise to
     36#        - nice - max nice priority allowed to raise to values: [-20, 19]
    3737#        - rtprio - max realtime priority
    3838#
     
    4141
    4242# No limits for root
    43 root            -
     43root             -
     44scripts-build    -
    4445
    4546# For everyone else,
    46 *               soft    core            0
    47 *               -       rss             524268
    48 *               -       data            1048576
    49 *               -       as              1048576
     47*                soft    core            0
     48*                -       rss             524268
     49*                -       data            1048576
     50*                -       as              1310720
     51
     52#*               soft    core            0
    5053#*               hard    rss             10000
    5154#@student        hard    nproc           20
  • trunk/server/fedora/config/etc/sudoers

    r914 r1259  
    3434
    3535## Updating the locate database
    36 Cmnd_Alias LOCATE = /usr/sbin/updatedb
     36Cmnd_Alias LOCATE = /usr/bin/updatedb
    3737
    3838## Storage
  • trunk/server/fedora/config/etc/sysconfig/openafs

    r1020 r1259  
    1010          Sulphur)
    1111            /usr/bin/fs sysname 'amd64_fedora9_scripts' 'amd64_fedora7_scripts' 'scripts' 'amd64_fedora9' 'amd64_fedora7' 'amd64_linux26' 'i386_deb40' 'i386_rhel4' 'i386_rhel3' 'i386_rh9' 'i386_linux26' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2' ;;
     12          Leonidas)
     13            /usr/bin/fs sysname 'amd64_fedora11_scripts' 'amd64_fedora9_scripts' 'amd64_fedora7_scripts' 'scripts' 'amd64_fedora11' 'amd64_fedora9' 'amd64_fedora7' 'amd64_linux26' 'i386_deb50' 'i386_deb40' 'i386_rhel4' 'i386_rhel3' 'i386_rh9' 'i386_linux26' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2' ;;
    1214          *)
    1315            echo "Warning: unknown platform. AFS sysname not set."
  • trunk/server/fedora/config/etc/syslog-ng/syslog-ng.conf

    r817 r1259  
    66# See syslog-ng(8) and syslog-ng.conf(5) for more information.
    77#
    8 # 20000925 gb@sysfive.com
    9 #
    10 # Updated by Frank Crawford (<Frank.Crawford@ac3.com.au>) - 10 Aug 2002
    11 #   - for Red Hat 7.3
    12 #   - totally do away with klogd
    13 #   - add message "kernel:" as is done with klogd.
    14 #
    15 # Updated by Frank Crawford (<Frank.Crawford@ac3.com.au>) - 22 Aug 2002
    16 #   - use the log_prefix option as per Balazs Scheidler's email
    17 #
    18 # Updated by Jose Pedro Oliveira (<jpo at di.uminho.pt>) - 05 Apr 2003
    19 #   - corrected filters 'f_filter2' and 'f_filter6'
    20 #     these filters were only allowing messages of one specific
    21 #     priority level; they should be allowing messages from that
    22 #     priority and upper levels.
    23 #
    24 # Updated by Jose Pedro Oliveira (<jpo at di.uminho.pt>) - 25 Jan 2005
    25 #   - Don't sync the d_mail destination
    26 #
    27 # Updated by Jose Pedro Oliveira (<jpo at di.uminho.pt>) - 01 Feb 2005
    28 #   - /proc/kmsg is a file not a pipe.
    29 #     (https://lists.balabit.hu/pipermail/syslog-ng/2005-February/006963.html)
    30 #
    31 # Updated by Jose Pedro Oliveira (<jpo at di.uminho.pt>) - 31 May 2007
    32 #   - increase the number of unix-stream max-connections (syslog-ng 2.0.4)
    33 #
    34 # Updated by Jose Pedro Oliveira (<jpo at di.uminho.pt>) - 26 July 2007
    35 #   - revert previous unix-stream max-connections change
    36 #     (the new unix-stream max-connections default in syslog-ng 2.0.5 is 256)
    37 #
    388
    399options {
    40     sync (0);
    41     time_reopen (10);
    42     log_fifo_size (1000);
    43     long_hostnames (off);
    44     use_dns (no);
    45     use_fqdn (no);
    46     create_dirs (no);
    47     keep_hostname (yes);
     10        sync (0);
     11        time_reopen (10);
     12        log_fifo_size (1000);
     13        long_hostnames (off);
     14        use_dns (no);
     15        use_fqdn (no);
     16        create_dirs (no);
     17        keep_hostname (yes);
    4818};
    4919
    5020source s_sys {
    51     file ("/proc/kmsg" log_prefix("kernel: "));
    52     unix-stream ("/dev/log");
    53     internal();
    54     # udp(ip(0.0.0.0) port(514));
    55     # tcp(ip(0.0.0.0) port(514));
     21        file ("/proc/kmsg" log_prefix("kernel: "));
     22        unix-stream ("/dev/log");
     23        internal();
     24        # udp(ip(0.0.0.0) port(514));
    5625};
    5726
     
    6332destination d_boot { file("/var/log/boot.log"); };
    6433destination d_cron { file("/var/log/cron"); };
     34#destination d_kern { file("/var/log/kern"); };
    6535destination d_mlal { usertty("*"); };
    6636
     
    6838#destination d_watch { program("/usr/local/libexec/watch-syslog.py"); };
    6939
    70 #filter f_filter1   { facility(kern); };
    71 filter f_filter2   { level(info..emerg) and
    72                      not facility(mail,authpriv,cron); };
    73 filter f_filter3   { facility(authpriv); };
    74 filter f_filter4   { facility(mail); };
    75 filter f_filter5   { level(emerg); };
    76 filter f_filter6   { facility(uucp) or
    77                      (facility(news) and level(crit..emerg)); };
    78 filter f_filter7   { facility(local7); };
    79 filter f_filter8   { facility(cron); };
     40#filter f_kernel     { facility(kern); };
     41filter f_default    { level(info..emerg) and
     42                        not (facility(mail)
     43                        or facility(authpriv)
     44                        or facility(cron)); };
     45filter f_auth       { facility(authpriv); };
     46filter f_mail       { facility(mail); };
     47filter f_emergency  { level(emerg); };
     48filter f_news       { facility(uucp) or
     49                        (facility(news)
     50                        and level(crit..emerg)); };
     51filter f_boot   { facility(local7); };
     52filter f_cron   { facility(cron); };
    8053
    8154filter f_oom { facility(kern) and (match("Out of memory:") or match("Killed process")); };
    8255
    83 #log { source(s_sys); filter(f_filter1); destination(d_cons); };
    84 log { source(s_sys); filter(f_filter2); destination(d_mesg); };
    85 log { source(s_sys); filter(f_filter3); destination(d_auth); };
    86 log { source(s_sys); filter(f_filter4); destination(d_mail); };
    87 log { source(s_sys); filter(f_filter5); destination(d_mlal); };
    88 log { source(s_sys); filter(f_filter6); destination(d_spol); };
    89 log { source(s_sys); filter(f_filter7); destination(d_boot); };
    90 log { source(s_sys); filter(f_filter8); destination(d_cron); };
     56#log { source(s_sys); filter(f_kernel); destination(d_cons); };
     57#log { source(s_sys); filter(f_kernel); destination(d_kern); };
     58log { source(s_sys); filter(f_default); destination(d_mesg); };
     59log { source(s_sys); filter(f_auth); destination(d_auth); };
     60log { source(s_sys); filter(f_mail); destination(d_mail); };
     61log { source(s_sys); filter(f_emergency); destination(d_mlal); };
     62log { source(s_sys); filter(f_news); destination(d_spol); };
     63log { source(s_sys); filter(f_boot); destination(d_boot); };
     64log { source(s_sys); filter(f_cron); destination(d_cron); };
    9165
    92 log { source(s_sys); filter(f_filter3); destination(d_zroot); };
    93 #log { source(s_sys); filter(f_filter2); destination(d_watch); };
     66log { source(s_sys); filter(f_auth); destination(d_zroot); };
     67#log { source(s_sys); filter(f_default); destination(d_watch); };
    9468log { source(s_sys); filter(f_oom); destination(d_zroot); };
    9569
    96 # vim:set ai ts=4 sw=4 sts=4 et:
     70# vim:ft=syslog-ng:ai:si:ts=4:sw=4:et:
  • trunk/server/fedora/config/etc/yum.repos.d/scripts.repo

    r866 r1259  
    11[scripts]
    22name=Scripts
    3 baseurl=http://web.mit.edu/scripts/rpm/
     3baseurl=http://web.mit.edu/scripts/rpm-fc11/
    44enabled=1
    55gpgcheck=0
Note: See TracChangeset for help on using the changeset viewer.