outstanding fix - replacing fixed locations to regex matched ones.

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1172 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/maintenance/mod_ngobjweb_conectiva10.spec b/maintenance/mod_ngobjweb_conectiva10.spec
index f27bb553aa97c2444c93fd9eaf7f8fbbe019ff71..ca6e2e87e6d963b6f8c0169a6677c75d2d10c472 100644 (file)
--- a/maintenance/mod_ngobjweb_conectiva10.spec
+++ b/maintenance/mod_ngobjweb_conectiva10.spec
@@ -69,12 +69,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up
@@ -128,12 +129,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up

diff --git a/maintenance/mod_ngobjweb_fedora.spec b/maintenance/mod_ngobjweb_fedora.spec
index b94f392d47cd0b62096fc859b8e99a60d033c017..6b717de18d4d75399fa165ed74b907544ab118aa 100644 (file)
--- a/maintenance/mod_ngobjweb_fedora.spec
+++ b/maintenance/mod_ngobjweb_fedora.spec
@@ -69,12 +69,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up
@@ -126,12 +127,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up

diff --git a/maintenance/mod_ngobjweb_mdk100.spec b/maintenance/mod_ngobjweb_mdk100.spec
index 771d298afec659a5112415cd38dee537d5f03201..5f945341e3144950093c8d3e0e48b589b55e12a2 100644 (file)
--- a/maintenance/mod_ngobjweb_mdk100.spec
+++ b/maintenance/mod_ngobjweb_mdk100.spec
@@ -69,12 +69,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up
@@ -126,12 +127,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up

diff --git a/maintenance/mod_ngobjweb_mdk101.spec b/maintenance/mod_ngobjweb_mdk101.spec
index 5db1831503597b9b5fb503a98869d8ef89ad00d5..157eabdd0516af2517948182b8ee429c175ad115 100644 (file)
--- a/maintenance/mod_ngobjweb_mdk101.spec
+++ b/maintenance/mod_ngobjweb_mdk101.spec
@@ -69,12 +69,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up
@@ -126,12 +127,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up

diff --git a/maintenance/mod_ngobjweb_redhat9.spec b/maintenance/mod_ngobjweb_redhat9.spec
index 6db80b8f9f55a482e831240d13f334ba8079c6d8..0d966134570f373c4ac57e49fddc0ed30d18c9a7 100644 (file)
--- a/maintenance/mod_ngobjweb_redhat9.spec
+++ b/maintenance/mod_ngobjweb_redhat9.spec
@@ -69,12 +69,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up
@@ -126,12 +127,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up

diff --git a/maintenance/mod_ngobjweb_rhel3.spec b/maintenance/mod_ngobjweb_rhel3.spec
index f43eae25a2f2817d97217cea6f8442c401fc39fe..7d5984f0e790b81e0cc12125a00509283a893f61 100644 (file)
--- a/maintenance/mod_ngobjweb_rhel3.spec
+++ b/maintenance/mod_ngobjweb_rhel3.spec
@@ -68,12 +68,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up
@@ -125,12 +126,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up

diff --git a/maintenance/mod_ngobjweb_rhel4.spec b/maintenance/mod_ngobjweb_rhel4.spec
index 9d44b492dafcce09f5c1d3ae9b110bb5d4813eb7..d1be4e817782c8505b1ff1f82b1af4b8a6edd146 100644 (file)
--- a/maintenance/mod_ngobjweb_rhel4.spec
+++ b/maintenance/mod_ngobjweb_rhel4.spec
@@ -69,12 +69,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up
@@ -126,12 +127,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up

diff --git a/maintenance/mod_ngobjweb_sles9.spec b/maintenance/mod_ngobjweb_sles9.spec
index 0864a039116636e2ed71d5d594e6c4e7edaf7f2c..c170734629fbbeaf6390664ccc3332a205d0bfe4 100644 (file)
--- a/maintenance/mod_ngobjweb_sles9.spec
+++ b/maintenance/mod_ngobjweb_sles9.spec
@@ -69,12 +69,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up
@@ -126,12 +127,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up

diff --git a/maintenance/mod_ngobjweb_slss8.spec b/maintenance/mod_ngobjweb_slss8.spec
index 83fcc82c4d23f86abbdd1eee7dd0c49e16b046f9..361f15800dce59dede7e4622be52fad9d0665335 100644 (file)
--- a/maintenance/mod_ngobjweb_slss8.spec
+++ b/maintenance/mod_ngobjweb_slss8.spec
@@ -69,12 +69,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up
@@ -126,12 +127,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up

diff --git a/maintenance/mod_ngobjweb_suse100.spec b/maintenance/mod_ngobjweb_suse100.spec
index 54e133dc678935e63e4ebbef840940a5c1e1fab7..a57bd8524103fe934dbf380b6cf8b888d6dfc088 100644 (file)
--- a/maintenance/mod_ngobjweb_suse100.spec
+++ b/maintenance/mod_ngobjweb_suse100.spec
@@ -69,12 +69,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up
@@ -126,12 +127,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up

diff --git a/maintenance/mod_ngobjweb_suse82.spec b/maintenance/mod_ngobjweb_suse82.spec
index e6ad89a50517a5b0cafd45da2d4a4acba3ed7643..40674270e8bab8190935078b12f362bfedde1003 100644 (file)
--- a/maintenance/mod_ngobjweb_suse82.spec
+++ b/maintenance/mod_ngobjweb_suse82.spec
@@ -69,12 +69,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up
@@ -126,12 +127,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up

diff --git a/maintenance/mod_ngobjweb_suse91.spec b/maintenance/mod_ngobjweb_suse91.spec
index 0864a039116636e2ed71d5d594e6c4e7edaf7f2c..c170734629fbbeaf6390664ccc3332a205d0bfe4 100644 (file)
--- a/maintenance/mod_ngobjweb_suse91.spec
+++ b/maintenance/mod_ngobjweb_suse91.spec
@@ -69,12 +69,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up
@@ -126,12 +127,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up

diff --git a/maintenance/mod_ngobjweb_suse92.spec b/maintenance/mod_ngobjweb_suse92.spec
index 0864a039116636e2ed71d5d594e6c4e7edaf7f2c..c170734629fbbeaf6390664ccc3332a205d0bfe4 100644 (file)
--- a/maintenance/mod_ngobjweb_suse92.spec
+++ b/maintenance/mod_ngobjweb_suse92.spec
@@ -69,12 +69,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up
@@ -126,12 +127,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up

diff --git a/maintenance/mod_ngobjweb_suse93.spec b/maintenance/mod_ngobjweb_suse93.spec
index 4347a38cf9f463060de80526454c219a55ed1f99..ac6c8979255369b7ead585048cc3dcda10a65c84 100644 (file)
--- a/maintenance/mod_ngobjweb_suse93.spec
+++ b/maintenance/mod_ngobjweb_suse93.spec
@@ -69,12 +69,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up
@@ -126,12 +127,13 @@ if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
 # explicitly allow access
-<Directory %{prefix}/share/opengroupware.org-1.1/www> 
+<DirectoryMatch %{prefix}/share/opengroupware.org-([0-9a-zA-Z]{1}).([0-9a-zA-Z]{1,})/www> 
   Order allow,deny 
   Allow from all 
 </Directory>
 # required aliases
-Alias /OpenGroupware11.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.1/www/
+AliasMatch ^/OpenGroupware([0-9a-zA-Z]{1})([0-9a-zA-Z]{1,})\.woa/WebServerResources/(.*) \
+           %{prefix}/share/opengroupware.org-$1.$2/www/$3
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 # hook up