Commit 30280f5c authored by Leigh Stoller's avatar Leigh Stoller

More FreeBSD 8.2 bits.

parent 7d8de97b
...@@ -682,8 +682,8 @@ ScriptAlias /cgi-bin/ "/usr/local/www/apache22/cgi-bin/" ...@@ -682,8 +682,8 @@ ScriptAlias /cgi-bin/ "/usr/local/www/apache22/cgi-bin/"
# #
# Mailman config stuff. # Mailman config stuff.
# #
ScriptAlias /mailman/ /usr/lib/mailman/cgi-bin/ ScriptAlias /mailman/ /usr/local/mailman/cgi-bin/
<Directory /usr/lib/mailman/cgi-bin/> <Directory /usr/local/mailman/cgi-bin/>
AllowOverride None AllowOverride None
Options ExecCGI Options ExecCGI
Order allow,deny Order allow,deny
......
...@@ -725,8 +725,8 @@ ScriptAlias /cgi-bin/ "/usr/local/www/apache22/cgi-bin/" ...@@ -725,8 +725,8 @@ ScriptAlias /cgi-bin/ "/usr/local/www/apache22/cgi-bin/"
# #
# Mailman config stuff. # Mailman config stuff.
# #
ScriptAlias /mailman/ /usr/lib/mailman/cgi-bin/ ScriptAlias /mailman/ /usr/local/mailman/cgi-bin/
<Directory /usr/lib/mailman/cgi-bin/> <Directory /usr/local/mailman/cgi-bin/>
AllowOverride None AllowOverride None
Options ExecCGI Options ExecCGI
Order allow,deny Order allow,deny
......
...@@ -778,27 +778,29 @@ Phase "patches", "Applying patches", sub { ...@@ -778,27 +778,29 @@ Phase "patches", "Applying patches", sub {
ExecQuietFatal("$PATCH -f -l -p0 -i $patchfile"); ExecQuietFatal("$PATCH -f -l -p0 -i $patchfile");
}; };
} }
Phase "Mysql.pm.patch", "Patching Mysql.pm", sub { if ($FBSD_MAJOR < 7) {
my $patchfile = $MYSQL_PM_PATCH; Phase "Mysql.pm.patch", "Patching Mysql.pm", sub {
$patchfile = `realpath $patchfile`; my $patchfile = $MYSQL_PM_PATCH;
chomp $patchfile; $patchfile = `realpath $patchfile`;
chomp $patchfile;
my $dir;
foreach $prefix (@INC) { my $dir;
if (-e "$prefix/Mysql.pm") { foreach $prefix (@INC) {
$dir = $prefix; if (-e "$prefix/Mysql.pm") {
last; $dir = $prefix;
last;
}
} }
} if (!defined($dir)) {
if (!defined($dir)) { PhaseFail("Unable to find Mysql.pm");
PhaseFail("Unable to find Mysql.pm"); }
}
if (!ExecQuiet("$PATCH -d $dir -C -f -l -R -i $patchfile")) {
if (!ExecQuiet("$PATCH -d $dir -C -f -l -R -i $patchfile")) { PhaseSkip("Patch already applied");
PhaseSkip("Patch already applied"); }
} ExecQuietFatal("$PATCH -d $dir -f -l -i $patchfile");
ExecQuietFatal("$PATCH -d $dir -f -l -i $patchfile"); };
}; }
Phase "perlselfloaderpatch", "Fixing perl self-loader", sub { Phase "perlselfloaderpatch", "Fixing perl self-loader", sub {
my $perldir = "/usr/local/lib/perl5/5.10.1"; my $perldir = "/usr/local/lib/perl5/5.10.1";
DoneIfDoesntExist("$perldir/SelfLoader.pm"); DoneIfDoesntExist("$perldir/SelfLoader.pm");
...@@ -1536,6 +1538,20 @@ Phase "sslcerts", "Setting up SSL certificates", sub { ...@@ -1536,6 +1538,20 @@ Phase "sslcerts", "Setting up SSL certificates", sub {
" chmod 640 ${ETC_EMULAB_DIR}/${EMULAB_PEM}' "); " chmod 640 ${ETC_EMULAB_DIR}/${EMULAB_PEM}' ");
}; };
Phase "apache", "Setting up Apache on boss", sub { Phase "apache", "Setting up Apache on boss", sub {
Phase "dirs", "Creating SSL directories ", sub {
PhaseSucceed()
if (-d "$APACHE_ETCDIR/ssl.crt" &&
-d "$APACHE_ETCDIR/ssl.key");
if (! -d "$APACHE_ETCDIR/ssl.crt") {
mkdir "$APACHE_ETCDIR/ssl.crt", 0700 or
PhaseFail("Unable to create $APACHE_ETCDIR/ssl.crt : $!");
}
if (! -d "$APACHE_ETCDIR/ssl.key") {
mkdir "$APACHE_ETCDIR/ssl.key", 0700 or
PhaseFail("Unable to create $APACHE_ETCDIR/ssl.key : $!");
}
};
Phase "cert", "Installing Apache SSL certificate", sub { Phase "cert", "Installing Apache SSL certificate", sub {
DoneIfExists("$APACHE_CERTFILE"); DoneIfExists("$APACHE_CERTFILE");
ExecQuietFatal("$CP $TOP_OBJDIR/ssl/$APACHE_CERTPEM ". ExecQuietFatal("$CP $TOP_OBJDIR/ssl/$APACHE_CERTPEM ".
......
...@@ -1011,7 +1011,7 @@ Phase "cron", "Adding cron jobs", sub { ...@@ -1011,7 +1011,7 @@ Phase "cron", "Adding cron jobs", sub {
my @cronlist = ("0 \t6\t*\t*\t*\troot\t$PREFIX/sbin/quotamail"); my @cronlist = ("0 \t6\t*\t*\t*\troot\t$PREFIX/sbin/quotamail");
if ($WIKISUPPORT) { if ($WIKISUPPORT) {
push(@cronlist, push(@cronlist,
"*/15 \t*\t*\t*\t*\troot\t(cd /usr/local/www/data/twiki/bin;". "*/15 \t*\t*\t*\t*\troot\t(cd $WWWDIR/twiki/bin;".
" ./mailnotify -q >> /var/tmp/mailnotify.log 2>&1)"); " ./mailnotify -q >> /var/tmp/mailnotify.log 2>&1)");
} }
AppendToFileFatal($CRONTAB, @cronlist); AppendToFileFatal($CRONTAB, @cronlist);
...@@ -1171,6 +1171,20 @@ Phase "apache", "Installing apache config file", sub { ...@@ -1171,6 +1171,20 @@ Phase "apache", "Installing apache config file", sub {
DoneIfEdited("$HTTPD_CONF"); DoneIfEdited("$HTTPD_CONF");
ExecQuietFatal("$GMAKE -C $TOP_OBJDIR/apache control-install"); ExecQuietFatal("$GMAKE -C $TOP_OBJDIR/apache control-install");
}; };
Phase "dirs", "Creating Apache SSL directories ", sub {
PhaseSucceed()
if (-d "$APACHE_ETCDIR/ssl.crt" &&
-d "$APACHE_ETCDIR/ssl.key");
if (! -d "$APACHE_ETCDIR/ssl.crt") {
mkdir "$APACHE_ETCDIR/ssl.crt", 0700 or
PhaseFail("Unable to create $APACHE_ETCDIR/ssl.crt : $!");
}
if (! -d "$APACHE_ETCDIR/ssl.key") {
mkdir "$APACHE_ETCDIR/ssl.key", 0700 or
PhaseFail("Unable to create $APACHE_ETCDIR/ssl.key : $!");
}
};
Phase "php.ini", "Installing php.ini file", sub { Phase "php.ini", "Installing php.ini file", sub {
DoneIfEdited($PHP_INI); DoneIfEdited($PHP_INI);
ExecQuietFatal("$GMAKE -C $TOP_OBJDIR/apache install-php-ini"); ExecQuietFatal("$GMAKE -C $TOP_OBJDIR/apache install-php-ini");
...@@ -1182,6 +1196,10 @@ Phase "wikidocs", "Installing wikidocs redirect", sub { ...@@ -1182,6 +1196,10 @@ Phase "wikidocs", "Installing wikidocs redirect", sub {
DoneIfExists("$WWWDIR/wikidocs/.htaccess"); DoneIfExists("$WWWDIR/wikidocs/.htaccess");
if (! -e "$WWWDIR") {
mkdir("$WWWDIR", 0755) or
PhaseFail("Unable to make $WWWDIR: $!");
}
if (! -e "$WWWDIR/wikidocs") { if (! -e "$WWWDIR/wikidocs") {
mkdir("$WWWDIR/wikidocs", 0755) or mkdir("$WWWDIR/wikidocs", 0755) or
PhaseFail("Unable to make $WWWDIR/wikidocs: $!"); PhaseFail("Unable to make $WWWDIR/wikidocs: $!");
...@@ -1405,7 +1423,7 @@ if ($CVSSUPPORT) { ...@@ -1405,7 +1423,7 @@ if ($CVSSUPPORT) {
if ($BUGDBSUPPORT) { if ($BUGDBSUPPORT) {
my $FLYSPRAYPWD = "$ETCDIR/flyspray.pwd"; my $FLYSPRAYPWD = "$ETCDIR/flyspray.pwd";
my $FLYSPRAYDIR = "/usr/local/www/data/flyspray"; my $FLYSPRAYDIR = "$WWWDIR/flyspray";
my $FLYSPRAYURL = "http://$OUTER_BOSS/downloads/flyspray-0.9.9.tgz"; my $FLYSPRAYURL = "http://$OUTER_BOSS/downloads/flyspray-0.9.9.tgz";
my $FLYSPRAYCONF = "$ETCDIR/flyspray.conf.php"; my $FLYSPRAYCONF = "$ETCDIR/flyspray.conf.php";
my $PHPCONFIG = $PHP_INI; my $PHPCONFIG = $PHP_INI;
...@@ -1535,7 +1553,7 @@ if ($BUGDBSUPPORT) { ...@@ -1535,7 +1553,7 @@ if ($BUGDBSUPPORT) {
} }
if ($WIKISUPPORT) { if ($WIKISUPPORT) {
my $WIKIDIR = "/usr/local/www/data/twiki"; my $WIKIDIR = "$WWWDIR/twiki";
my $WIKICONF = "LocalSite.cfg"; my $WIKICONF = "LocalSite.cfg";
my $WIKIURL = "http://$OUTER_BOSS/downloads/twiki-4.1.tgz"; my $WIKIURL = "http://$OUTER_BOSS/downloads/twiki-4.1.tgz";
my $localtarfile = "/tmp/twiki.tgz"; my $localtarfile = "/tmp/twiki.tgz";
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
# Wrapper for DHCPD which has a habit of dying. # Wrapper for DHCPD which has a habit of dying.
# #
elabinelab="@ELABINELAB@" elabinelab="@ELABINELAB@"
configfile="/usr/local/etc/dhcpd.conf"
case "$1" in case "$1" in
start) start)
# limit to control network # limit to control network
...@@ -13,7 +14,7 @@ case "$1" in ...@@ -13,7 +14,7 @@ case "$1" in
if [ -x @prefix@/sbin/daemon_wrapper ]; then if [ -x @prefix@/sbin/daemon_wrapper ]; then
echo -n " dhcpd wrapper" echo -n " dhcpd wrapper"
@prefix@/sbin/daemon_wrapper \ @prefix@/sbin/daemon_wrapper \
/usr/local/sbin/dhcpd -f $cnetif /usr/local/sbin/dhcpd -f $cnetif -cf $configfile
fi fi
;; ;;
stop) stop)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment