Changeset 27681

Timestamp:

2013-06-21T00:21:08+12:00 (11 years ago)

Author:

davidb

Message:

Fine-tuning of domain name and URL prefix to better cope with being behind a firewall

Location:

gs2-extensions/afrepo/trunk/src/src

Files:

• AFRepo.GSDLEXT.class.php.in (modified) (2 diffs)
• httpd-afrepo.conf.in (modified) (1 diff)

gs2-extensions/afrepo/trunk/src/src/AFRepo.GSDLEXT.class.php.in

@@ -25 +25 @@
 
     public function getURIPrefix() {
-        return "@afrepo-http-prefix@/afrepo/";
+        #return "@afrepo-http-prefix@/afrepo/";
+        return "@public-facing-afrepo-http-prefix@";
     }
 
     /* Done this way, can talk to the 4store server directly
            rather than relying on proxying through the PHP-based 'afrepo' server */
+    public function getTrippleStoreLocalURIPrefix() {
+      //return "@afrepo-http-prefix@/4store/";
+        return "@4store-http-prefix@/";
+    }
+
     public function getTrippleStoreURIPrefix() {
-        return "@afrepo-http-prefix@/4store/";
+        return "@public-facing-4store-http-prefix@";
     }
 
@@ -39 +45 @@
 
     public function getDataEndpoint() {
-        return $this->getTrippleStoreURIPrefix() . "data/";
+        return $this->getTrippleStoreLocalURIPrefix() . "data/";
     }
 

gs2-extensions/afrepo/trunk/src/src/httpd-afrepo.conf.in

@@ -16 +16 @@
 </IfModule>
 
-ProxyPass /4store/data @4store-http-prefix@/data
-ProxyPassReverse /4store/data @4store-http-prefix@/data
+#ProxyPass /4store/data @4store-http-prefix@/data
+#ProxyPassReverse /4store/data @4store-http-prefix@/data
 
-ProxyPass /4store/sparql @4store-http-prefix@/sparql
-ProxyPassReverse /4store/sparql @4store-http-prefix@/sparql
+#ProxyPass /4store/sparql @4store-http-prefix@/sparql
+#ProxyPassReverse /4store/sparql @4store-http-prefix@/sparql
 
-ProxyPass /4store/test @4store-http-prefix@/test
-ProxyPassReverse /4store/test @4store-http-prefix@/test
+#ProxyPass /4store/test @4store-http-prefix@/test
+#ProxyPassReverse /4store/test @4store-http-prefix@/test
 
-ProxyPass /4store/status @4store-http-prefix@/status
-ProxyPassReverse /4store/status @4store-http-prefix@/status
+#ProxyPass /4store/status @4store-http-prefix@/status
+#ProxyPassReverse /4store/status @4store-http-prefix@/status
+
+ProxyPass /afrepo/4store/ @4store-http-prefix@/
+ProxyPassReverse /afrepo/4store/ @4store-http-prefix@/
+
 
 RewriteEngine on