Changeset 3776 in MondoRescue

Timestamp:

Nov 16, 2020, 11:09:45 AM (3 years ago)

Author:

Bruno Cornec

Message:

setup dploy.org web presence

File:

• branches/3.3/ansible/roles/httpd/templates/dploy.org.conf (modified) (6 diffs)

branches/3.3/ansible/roles/httpd/templates/dploy.org.conf

@@ -1 +1 @@
 <VirtualHost {{ ip_int }}>
     ServerName www.dploy.org
+    ServerAlias dploy.org    
     ServerAdmin webmaster@dploy.org
-    DocumentRoot /mondo/dploy/www/html/dploy
+    DocumentRoot /prj/www/html/dploy
     CustomLog /var/log/httpd/www.dploy.org/access_log combined
     Errorlog /var/log/httpd/www.dploy.org/error_log
@@ -9 +10 @@
     RewriteRule     ^/$  /index.shtml
 
-    <Directory "/mondo/dploy/www/html/dploy">
+    <Directory "/prj/www/html/dploy">
     DirectoryIndex index.shtml
         Options -Indexes +MultiViews +FollowSymLinks +Includes
@@ -16 +17 @@
     </Directory>
 
-    <Directory "/mondo/dploy/www/cgi-bin">
+    <Directory "/prj/www/html/dploy/ftp">
+        Options +Indexes +MultiViews +FollowSymLinks
+        AllowOverride None
+        Require all granted
+    </Directory>
+
+    <Directory "/var/www/cgi-bin">
         AllowOverride All
         Options +ExecCGI +FollowSymLinks
@@ -22 +29 @@
     </Directory>
 
-    ScriptAlias /cgi-bin/ "/mondo/dploy/www/cgi-bin/"
+</VirtualHost>
 
-    # fix mdk bug #16298
-    PassEnv LC_ALL
-    PassEnv LANG
-
-    # fix mdk bug #16298
-    <Directory "/usr/share/trac/htdocs/">
-        Options +Indexes +MultiViews
+<VirtualHost {{ ip_int }}>
+    ServerName ftp.dploy.org
+    DocumentRoot /prj/ftp
+    CustomLog /var/log/httpd/www.dploy.org/access_log combined
+    Errorlog /var/log/httpd/www.dploy.org/error_log
+    <Directory "/prj/ftp">
+        Options +Indexes +MultiViews +FollowSymLinks
         AllowOverride None
         Require all granted
-        Allow from All
     </Directory>
-    
-    # You need something like this to authenticate users
-    <Location "/cgi-bin/trac.cgi/login">
-        AuthType Basic
-        AuthName "Dploy"
-        AuthUserFile /usr/local/etc/dploy.htpasswd
-        Require valid-user
-    </Location>
 </VirtualHost>
 
 <VirtualHost {{ ip_int }}>
     ServerName trac.dploy.org
-    DefaultInitEnv TRAC_ENV "/mondo/dploy/trac/dploy.env"
-    DocumentRoot /mondo/dploy/www/cgi-bin/trac.cgi
+    DocumentRoot /prj/www/html/dploy
+    DefaultInitEnv TRAC_ENV "/prj/trac/ploy.env"
     ServerAdmin webmaster@dploy.org
     CustomLog /var/log/httpd/www.dploy.org/access_log combined
     Errorlog /var/log/httpd/www.dploy.org/error_log
 
-    # fix mdk bug #16298
-    PassEnv LC_ALL
-    PassEnv LANG
-
-    <Directory "/mondo/dploy/www/cgi-bin">
+    <Directory "/var/www/cgi-bin">
         AllowOverride All
         Options +ExecCGI +FollowSymLinks
@@ -63 +57 @@
     </Directory>
 
-    Alias /trac/ "/usr/share/trac/htdocs/"
-    ScriptAlias /cgi-bin/ "/mondo/dploy/www/cgi-bin/"
 
-    # You need something like this to authenticate users
-    <Location "/login">
-        AuthType Basic
-        AuthName "Dploy"
-        AuthUserFile /usr/local/etc/trac.htpasswd
-        Require valid-user
-    </Location>
+    ScriptAlias / "/var/www/cgi-bin/trac.fcgi/"
 </VirtualHost>
 
@@ -78 +64 @@
     ServerName www1.dploy.org
     ServerAdmin webmaster@dploy.org
-    DocumentRoot /mondo/dploy/www/html/test
+    DocumentRoot /prj/www/html/dploytest
     CustomLog /var/log/httpd/www1.dploy.org/access_log combined
     Errorlog /var/log/httpd/www1.dploy.org/error_log
-    <Directory "/mondo/dploy/www/html/test">
+    <Directory "/prj/www/html/dploytest">
         Options -Indexes +MultiViews +FollowSymLinks +Includes
         AllowOverride None