Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 2308 → Rev 2309

/scripts/alcasar-importcert.sh
29,19 → 29,7
{
$SED "s/^HOSTNAME=.*/HOSTNAME=alcasar/g" /usr/local/etc/alcasar.conf
$SED "s/^DOMAIN=.*/DOMAIN=localdomain/g" /usr/local/etc/alcasar.conf
cat <<EOF > /etc/hosts
127.0.0.1 localhost
$PRIVATE_IP alcasar alcasar.localdomain
EOF
$SED "s/^locationname.*/locationname\talcasar.localdomain/g" /etc/chilli.conf
$SED "s/^uamserver.*/uamserver\thttps:\/\/alcasar.localdomain\/intercept.php/g" /etc/chilli.conf
$SED "s/^radiusnasid.*/radiusnasid\talcasar.localdomain/g" /etc/chilli.conf
$SED "s/^uamallowed.*/uamallowed\talcasar,alcasar.localdomain/g" /etc/chilli.conf
$SED "s/^ServerName.*/ServerName alcasar.localdomain/g" /etc/httpd/conf/httpd.conf
hostnamectl set-hostname alcasar.localdomain
$SED "s/^\tErrorDocument.*/\tErrorDocument 404 https:\/\/alcasar.localdomain\//g" /etc/httpd/conf/webapps.d/alcasar.conf
$SED "s/^\tAuthDigestDomain.*/\tAuthDigestDomain alcasar.localdomain/g" /etc/httpd/conf/webapps.d/alcasar.conf
$SED "s/^ ServerName.*/ ServerName alcasar.localdomain/g" /etc/httpd/conf/sites.d/00_default_vhosts.conf /etc/httpd/conf/sites.d/00_default_ssl_vhost.conf
/usr/local/bin/alcasar-conf.sh --apply
}
 
function defaultCert()
70,25 → 58,10
echo "fqdn=$fqdn hostname=$hostname domain=$domain"
 
#check fqdn format
if [[ "$fqdn" != "" && "$domain" != "" ]];
then
if [[ "$fqdn" != "" && "$domain" != "" ]]; then
$SED "s/^HOSTNAME=.*/HOSTNAME=$hostname/g" /usr/local/etc/alcasar.conf
$SED "s/^DOMAIN=.*/DOMAIN=$domain/g" /usr/local/etc/alcasar.conf
domainNames="alcasar.localdomain $hostname $fqdn"
if [ "$hostname" != "alcasar" ]; then domainNames="alcasar $domainNames"; fi
cat <<EOF > /etc/hosts
127.0.0.1 localhost
$PRIVATE_IP $domainNames
EOF
$SED "s/^locationname.*/locationname\t$fqdn/g" /etc/chilli.conf
$SED "s/^uamserver.*/uamserver\thttps:\/\/$fqdn\/intercept.php/g" /etc/chilli.conf
$SED "s/^radiusnasid.*/radiusnasid\t$fqdn/g" /etc/chilli.conf
$SED "s/^uamallowed.*/uamallowed\t$hostname,$fqdn/g" /etc/chilli.conf
$SED "s/^ServerName.*/ServerName $fqdn/g" /etc/httpd/conf/httpd.conf
hostnamectl set-hostname $fqdn
$SED "s/^\tErrorDocument.*/\tErrorDocument 404 https:\/\/$fqdn\//g" /etc/httpd/conf/webapps.d/alcasar.conf
$SED "s/^\tAuthDigestDomain.*/\tAuthDigestDomain $fqdn/g" /etc/httpd/conf/webapps.d/alcasar.conf
$SED "s/^ ServerName.*/ ServerName $fqdn/g" /etc/httpd/conf/sites.d/00_default_vhosts.conf /etc/httpd/conf/sites.d/00_default_ssl_vhost.conf /etc/httpd/conf/vhosts-ssl.default
/usr/local/bin/alcasar-conf.sh --apply
fi
}