summaryrefslogtreecommitdiffstats
path: root/sca-cpp
diff options
context:
space:
mode:
Diffstat (limited to 'sca-cpp')
-rwxr-xr-xsca-cpp/trunk/modules/http/httpd-conf18
-rwxr-xr-xsca-cpp/trunk/modules/openid/openid-conf10
-rwxr-xr-xsca-cpp/trunk/modules/openid/openid-step2-conf10
3 files changed, 22 insertions, 16 deletions
diff --git a/sca-cpp/trunk/modules/http/httpd-conf b/sca-cpp/trunk/modules/http/httpd-conf
index ed2b7bb06d..37fa2e4051 100755
--- a/sca-cpp/trunk/modules/http/httpd-conf
+++ b/sca-cpp/trunk/modules/http/httpd-conf
@@ -22,6 +22,8 @@ here=`readlink -f $0`; here=`dirname $here`
mkdir -p $1
root=`readlink -f $1`
+jsprefix=`readlink -f $here/../js`
+
host=$2
port=`$here/httpd-addr port $3`
pport=`$here/httpd-addr pport $3`
@@ -103,22 +105,6 @@ Require all granted
AuthType None
Require all granted
</Location>
-<Location /openid>
-AuthType None
-Require all granted
-</Location>
-<Location /ui>
-AuthType None
-Require all granted
-</Location>
-<Location /wiring>
-AuthType None
-Require all granted
-</Location>
-<Location /.well-known/host-meta>
-AuthType None
-Require all granted
-</Location>
<Location /favicon.ico>
AuthType None
Require all granted
diff --git a/sca-cpp/trunk/modules/openid/openid-conf b/sca-cpp/trunk/modules/openid/openid-conf
index 1a5739b5aa..797f8b0607 100755
--- a/sca-cpp/trunk/modules/openid/openid-conf
+++ b/sca-cpp/trunk/modules/openid/openid-conf
@@ -55,3 +55,13 @@ AuthOpenIDAXAdd LASTNAME http://axschema.org/namePerson/last
EOF
+cat >>$root/conf/httpd.conf <<EOF
+# Generated by: openid-conf $*
+# Allow access to /openid location
+<Location /openid>
+AuthType None
+Require all granted
+</Location>
+
+EOF
+
diff --git a/sca-cpp/trunk/modules/openid/openid-step2-conf b/sca-cpp/trunk/modules/openid/openid-step2-conf
index d91becf7a4..559a62d20b 100755
--- a/sca-cpp/trunk/modules/openid/openid-step2-conf
+++ b/sca-cpp/trunk/modules/openid/openid-step2-conf
@@ -42,6 +42,16 @@ ForceType text/plain
EOF
+cat >>$root/conf/httpd.conf <<EOF
+# Generated by: openid-conf $*
+# Allow access to /.well-known/host-meta location
+<Location /.well-known/host-meta>
+AuthType None
+Require all granted
+</Location>
+
+EOF
+
# Generate OpenID XRDS document
cat >$root/conf/openid.xrds <<EOF
<?xml version="1.0" encoding="UTF-8"?>