Changeset 1097

Timestamp:

06/24/11 17:15:39 (11 months ago)

Author:

metrot

Message:

Ajout du service SVN pour CentOS
Configuration de reverse proxy web pour SVN sous CentOS

Location:

trunk/lib

Files:

• middleware/config_http_reverse_proxy.sh (modified) (1 diff)
• template/config_svn_repositories.ex (moved) (moved from trunk/lib/template/deb/config_svn_repositories.ex) (1 diff)
• template/rpm/install_svn.ex (added)
• template/vh4reverse_proxy (modified) (1 diff)
• template/vh4svn_server (modified) (2 diffs)
• template/vh_common4reverse_proxy.pm (modified) (1 diff)
• template/vh_svn4reverse_proxy (modified) (2 diffs)

trunk/lib/middleware/config_http_reverse_proxy.sh

@@ -11 +11 @@
 placomgr put vh4reverse_proxy {apache_vh_conf_file} $*
 placomgr put vh_spip4reverse_proxy {apache_spip_conf_file} $*
-#placomgr put vh_svn4reverse_proxy {apache_svn_conf_file} $*
+placomgr put vh_svn4reverse_proxy {apache_svn_conf_file} $*
 #placomgr put vh_sympa4reverse_proxy {apache_sympa_conf_file} $*
 placomgr put vh_horde4reverse_proxy {apache_horde_conf_file} $*

trunk/lib/template/config_svn_repositories.ex

@@ -10 +10 @@
     $OUT .= "then \n";
     $OUT .= "svnadmin create --fs-type fsfs $dir_repo/$r \n";
-    $OUT .= "chown -R www-data:www-data $dir_repo/$r \n";
+    $OUT .= "chown -R $apache_uid:$apache_uid $dir_repo/$r \n";
     $OUT .= "chmod -R 700 $dir_repo/$r \n" ;
     $OUT .= "fi \n";

trunk/lib/template/vh4reverse_proxy

@@ -61 +61 @@
     }
 
-    #if ($v->{type} =~ /^svn$/i) {
-    #  writecommonssl($v,$vh,$vh,0,0,1)
-    #}
+    if ($v->{type} =~ /^svn$/i) {
+        $OUT.=writecommonssl($v,$vh,$vh,0,0,1)
+    }
   }
 

trunk/lib/template/vh4svn_server

@@ -24 +24 @@
   LogLevel    Warn
 
-  <Location />
+  <Location /svn>
    DAV svn
    SVNParentPath {!$dir_repo!}
@@ -33 +33 @@
   {
     $OUT .= "# $r\n";
-    $OUT .= "  <Location /$r>\n";
+    $OUT .= "  <Location /svn/$r>\n";
     $OUT .= "   AuthType Basic\n";
     $OUT .= "   AuthName \"Svn repository : $r\"\n";

trunk/lib/template/vh_common4reverse_proxy.pm

@@ -59 +59 @@
         $out.=sprintf("\t\tSetOutputFilter  INFLATE;proxy-html;DEFLATE\n");
     }
+    if ($svn) {
+        $out.=sprintf("\t\t<Limit OPTIONS PROPFIND GET REPORT MKACTIVITY PROPPATCH PUT CHECKOUT MKCOL MOVE COPY DELETE LOCK UNLOCK MERGE>\n");
+        $out.=sprintf("\t\t\tOrder Deny,Allow\n");
+        $out.=sprintf("\t\t\tAllow from all\n");
+        $out.=sprintf("\t\t\tSatisfy Any\n");
+        $out.=sprintf("\t\t</Limit>\n");
+    }
     $out.=sprintf("\t</Location>\n\n");
     

trunk/lib/template/vh_svn4reverse_proxy

@@ -8 +8 @@
   $OUT="";
 
-  sub writeconf
-  {
-    my($v,$vh,$https,$targetvh,$revproxy,$rewritehtml,$dav) = @_ ;
-
-    $OUT .= writecommonconf(@_) ;
-
-    if ($revproxy)
-    {
-      $OUT.=sprintf("  ProxyPass / http://%s/\n",$targetvh);
-      if ($rewritehtml) { $OUT.=sprintf("  ProxyHTMLURLMAP http://%s/ /\n",$targetvh); }
-      if ($dav)
-      {
-        $OUT.=sprintf("  <Location /dav>\n");
-        $OUT.=sprintf("    RequestHeader edit Destination ^https://%s/(.*)\$ http://%s/\$1\n",$v->{external_server_name},$targetvh);
-        $OUT.=sprintf("  </Location>\n");
-      }
-      $OUT.=sprintf("  <Location />\n");
-      $OUT.=sprintf("    ProxyPassReverse http://%s/\n",$targetvh);
-
-      $OUT.="    <Limit OPTIONS PROPFIND GET REPORT MKACTIVITY PROPPATCH PUT CHECKOUT MKCOL MOVE COPY DELETE LOCK UNLOCK MERGE>\n";
-      $OUT.="      Order Deny,Allow\n";
-      $OUT.="      Allow from all\n";
-      $OUT.="      Satisfy Any\n";
-      $OUT.="    </Limit>\n";
-
-      if ($rewritehtml) { $OUT.=sprintf("    SetOutputFilter  INFLATE;proxy-html;DEFLATE\n"); }
-      $OUT.=sprintf("  </Location>\n");
-    }
-    $OUT.="</VirtualHost>\n";
-    $OUT.="</IfModule>\n" if $https ;
-  }
-
   while (($k,$v)=each %vh)
   {
@@ -45 +13 @@
     next unless $v->{type} =~ /^svn$/i ;
 
-    # HTTPS vh definition
-    # writeconf($v,$vh,$https,$targetvh,$revproxy,$rewritehtml,$dav)
-    writeconf($v,$vh,1,$vh,1,0,0) ;
+     # HTTP vh definition
+    # writeconf($v,$vh,$targetvh,$revproxy,$rewritehtml,$dav)
+    $OUT.=writecommontop($v,$vh,$vh,0,0,0) ;
+    $OUT.=sprintf("\tRewriteRule ^/(.*)${dollar} https://%s/%s/${dollar}1\n" ,$external_hostname,$vh);
+    $OUT.=writecommonbottom($v,$vh,$vh,0,0,0);
   }
 !}