Commit d19a4e4c authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Deal with an apache startup file bug in FreeBSD6. This bug is fixed in

the current port, but my fix is harmless.
parent c57f649d
......@@ -929,6 +929,10 @@ Phase "sslcerts", "Setting up SSL certificates", sub {
Phase "rc.d", "Installing Apache startup file", sub {
DoneIfExists("$RCDIR/apache.sh");
ExecQuietFatal("mv $RCDIR/apache.sh.sample $RCDIR/apache.sh");
if ($FBSD_VERSION == 4) {
ExecQuietFatal("sed -i .orig -e 's/^apache_/#apache_/' ".
"$RCDIR/apache.sh");
}
};
Phase "starting", "Starting Apache server", sub {
DoneIfExists("$VARRUN/httpd.pid");
......@@ -946,9 +950,8 @@ Phase "sslcerts", "Setting up SSL certificates", sub {
" ${USERNODE}:$APACHE_KEYFILE_OPS");
};
Phase "rc.d", "Installing Apache startup file", sub {
ExecQuietFatal("$SSH -o 'BatchMode=yes' root\@${USERNODE} ".
" cp -f $RCDIR/apache.sh.sample ".
" $RCDIR/apache.sh");
ExecQuietFatal("$SCP $RCDIR/apache.sh ".
" ${USERNODE}:$RCDIR/apache.sh");
};
};
}
......
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