All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit b94aa21e authored by Leigh B Stoller's avatar Leigh B Stoller

Changes for apache24 upgrade.

parent a4636949
This diff is collapsed.
This diff is collapsed.
......@@ -20,6 +20,9 @@ sub Install($$$)
return 0;
}
my $apache = ("$APACHE_VERSION" eq "22" ? "apache22" :
"$APACHE_VERSION" eq "24" ? "apache24" : "");
Phase "rc.conf", "Adding testbed content to $RCCONF", sub {
DoneIfEdited($RCCONF);
my @strings = (qq|rpcbind_enable="YES"|,
......@@ -28,12 +31,13 @@ sub Install($$$)
qq|inetd_flags="-wW -R 0"|,
qq|syslogd_flags=""|,
qq|tftpd_flags="-lvvvv -C 40 -s /tftpboot"|,
(("$APACHE_VERSION" eq "22") ?
(qq|apache22_enable="YES"|,
qq|apache22_flags="-DSSL"|,
qq|apache22_profiles="www"|,
"apache22_www_configfile=\"${HTTPD_CONF}\"",
qq|apache22_www_enable="YES"|) :
(("$APACHE_VERSION" eq "22" ||
"$APACHE_VERSION" eq "24") ?
("${apache}_enable=\"YES\"",
"${apache}_flags=\"-DSSL\"",
"${apache}_profiles=\"www\"",
"${apache}_www_configfile=\"${HTTPD_CONF}\"",
"${apache}_www_enable=\"YES\"") :
(qq|apache_enable="YES"|,
qq|apache_flags="-DSSL"|)),
qq|pubsubd_flags="-T 10"|);
......
#!/usr/bin/perl -w
#
# Copyright (c) 2008-2017 University of Utah and the Flux Group.
# Copyright (c) 2008-2018 University of Utah and the Flux Group.
#
# {{{GENIPUBLIC-LICENSE
#
......@@ -97,7 +97,8 @@ my $FETCH = "/usr/bin/fetch";
my $OPENSSL = "/usr/bin/openssl";
my $FIXROOTCERT = "$TB/sbin/fixrootcert";
my $MYSAURN = "urn:publicid:IDN+@OURDOMAIN@+authority+sa";
my $APACHEPREFIX = ("@APACHE_VERSION@" == "22" ? "apache22" : "apache");
my $APACHEPREFIX = ("@APACHE_VERSION@" == "22" ? "apache22" :
"@APACHE_VERSION@" == "24" ? "apache24" : "apache");
my $APACHE_START = "@APACHE_START_COMMAND@";
# un-taint path
......
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