Changeset 2554 for branches/fc20-dev


Ignore:
Timestamp:
Aug 1, 2014, 11:56:48 PM (8 years ago)
Author:
andersk
Message:
Merge r2521:2550 from trunk into branches/fc20-dev
Location:
branches/fc20-dev
Files:
6 edited
8 copied

Legend:

Unmodified
Added
Removed
  • branches/fc20-dev

  • branches/fc20-dev/server/fedora/config/etc/aliases

    r2522 r2554  
    109109# cssa: spam, added 2014-02-01
    110110cssa:   /dev/null
     111# mitlti: added 2014-07-26, causing way too much queued mail and not
     112# yet responded to mail by -root
     113mitlti:         /dev/null
  • branches/fc20-dev/server/fedora/config/etc/httpd/vhosts.d/roost.conf

    r2541 r2554  
    44        ServerName roost.mit.edu
    55        ServerAlias roost
    6         DocumentRoot /afs/sipb.mit.edu/project/roost/web_scripts
     6        DocumentRoot /afs/sipb.mit.edu/project/roost/web_scripts/prod
    77        Alias /~roost /afs/sipb.mit.edu/project/roost/web_scripts
    88        SuExecUserGroup roost roost
     
    1414                ServerName roost.mit.edu
    1515                ServerAlias roost
    16                 DocumentRoot /afs/sipb.mit.edu/project/roost/web_scripts
     16                DocumentRoot /afs/sipb.mit.edu/project/roost/web_scripts/prod
    1717                Alias /~roost /afs/sipb.mit.edu/project/roost/web_scripts
    1818                SuExecUserGroup roost roost
     
    2424                ServerName roost.mit.edu
    2525                ServerAlias roost
    26                 DocumentRoot /afs/sipb.mit.edu/project/roost/web_scripts
     26                DocumentRoot /afs/sipb.mit.edu/project/roost/web_scripts/prod
    2727                Alias /~roost /afs/sipb.mit.edu/project/roost/web_scripts
    2828                SuExecUserGroup roost roost
  • branches/fc20-dev/server/fedora/config/etc/nagios/check_ldap_mmr

    r1671 r2554  
    11#!/bin/sh
    22
     3export USE_NEWLINES=1
    34exec /usr/bin/sudo -u signup /etc/nagios/check_ldap_mmr.real
  • branches/fc20-dev/server/fedora/config/etc/pki/tls/certs/check.pl

    r1302 r2554  
    11#!/usr/bin/perl
    22
     3use strict;
     4use warnings;
     5use autodie;
     6use Date::Parse;
    37use File::Basename;
    4 use Date::Parse;
     8use Getopt::Long qw(:config bundling);
     9use IPC::Open2;
    510
    6 my $dir = dirname($0);
    7 chdir $dir or die "Failed to chdir('$dir'): $!";
     11chdir dirname($0);
    812
    913my $now = time();
    1014
    11 our $verbose = 0;
    12 $verbose = 1 if ($ARGV[0] eq "-v");
     15GetOptions(
     16  "verbose|v" => \my $verbose,
     17) or exit 2;
    1318
    1419use constant WARNING => 60*60*24*14; # Warn if a cert is expiring within 14 days
    1520
    1621foreach my $cert (glob "*.pem") {
    17   open(X509, "-|", qw(openssl x509 -in), $cert, qw(-enddate -noout)) or die "Couldn't invoke openssl x509: $!";
    18   chomp(my $exp = <X509>);
    19   close(X509);
    20   $exp =~ s/^notAfter=// or warn "Cert appears broken: $cert";
     22  open(CERT, "<", $cert);
     23  my $ins = do {local $/; <CERT>};
     24  close(CERT);
    2125
    22   my $time = str2time($exp);
     26  for my $in ($ins =~ /^-----BEGIN CERTIFICATE-----\n.*?^-----END CERTIFICATE-----\n/msg) {
     27    my $pid = open2(\*X509, \*IN, qw(openssl x509 -enddate -noout));
     28    print IN $in;
     29    close(IN);
     30    my $out = do {local $/; <X509>};
     31    close(X509);
     32    waitpid($pid, 0);
    2333
    24   if ($verbose || ($time - $now) <= WARNING) {
    25     printf "Certificate expiring in %.2f days: %s for ", (($time - $now) / (60.0*60*24)), $cert;
    26     system(qw(openssl x509 -in), $cert, qw(-subject -noout));
     34    my $exp;
     35    unless (defined $out and ($exp) = $out =~ /^notAfter=(.*)$/m) {
     36      warn "Cert appears broken: $cert";
     37      next;
     38    }
     39
     40    my $time = str2time($exp);
     41
     42    if ($verbose || ($time - $now) <= WARNING) {
     43      printf "Certificate expiring in %.2f days: %s for ", (($time - $now) / (60.0*60*24)), $cert;
     44      open(IN, '|-', qw(openssl x509 -subject -noout));
     45      print IN $in;
     46      close(IN);
     47    }
    2748  }
    2849}
  • branches/fc20-dev/server/fedora/config/etc/postfix/blocked_users

    r2522 r2554  
    55buechley
    66cssa
     7mitlti
Note: See TracChangeset for help on using the changeset viewer.