configuration file update
authorNIIBE Yutaka <gniibe@fsij.org>
Wed, 4 Jun 2014 01:17:45 +0000 (10:17 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Wed, 4 Jun 2014 01:17:45 +0000 (10:17 +0900)
apache-settings.conf [deleted file]
git-fsij-org.conf
www-fsij-org.conf

diff --git a/apache-settings.conf b/apache-settings.conf
deleted file mode 100644 (file)
index ae64d95..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-# Alias /robots.txt /home/fsij/www/www.fsij.org/robots.txt
-
-RedirectMatch ^/$ /wiki/FreeSoftwareInitiativeofJapan
-RedirectMatch ^/wiki$ /wiki/FreeSoftwareInitiativeofJapan
-
-Alias /favicon.ico /home/fsij/homepage/images/favicon.ico
-Alias /tracdata/ /home/fsij/homepage/tracdata/
-Alias /images/ /home/fsij/homepage/images/
-Alias /attachments/ /home/fsij/homepage/attachments/
-Alias /css/ /home/fsij/homepage/css/
-
-Alias /doc-gnuk /home/fsij/gnuk-doc-html
-<Directory /home/fsij/gnuk-doc-html>
-  Order allow,deny
-  Allow from all
-</Directory>
-
-Alias /wiki /home/fsij/homepage/trac-wsgi/display_trac_wiki.py/wiki
-WSGIDaemonProcess www.fsij.org/wiki user=www-data group=www-data processes=1 threads=5 home=/home/fsij/homepage
-<Directory /home/fsij/homepage/trac-wsgi>
-  WSGIProcessGroup  www.fsij.org/wiki
-  WSGIApplicationGroup www.fsij.org/wiki
-  SetHandler wsgi-script
-  Options +ExecCGI -MultiViews
-  Order allow,deny
-  Allow from all
-</Directory>
-
-AliasMatch ^/(news|system|monthly-meetings|gnuk)(.*)$ /home/fsij/homepage/pyblosxom/weblog.py/$1$2
-WSGIDaemonProcess www.fsij.org/blog user=www-data group=www-data processes=1 threads=5 home=/home/fsij/homepage
-<Directory /home/fsij/homepage/pyblosxom>
-  WSGIProcessGroup  www.fsij.org/blog
-  WSGIApplicationGroup www.fsij.org/blog
-  SetHandler wsgi-script
-  AllowOverride None
-  Options +ExecCGI -MultiViews
-  Order allow,deny
-  Allow from all
-</Directory>
-
-<Directory /home/fsij/homepage/(tracdata|images|attachments|css)>
-  Order allow,deny
-  Allow from all
-</Directory>
index d4e88a9..f362a87 100644 (file)
          Order allow,deny
          allow from all
        </Directory>
+       <Directory "/home/git-fsij/.ssh">
+         Options None
+         AllowOverride None
+         Order deny,allow
+         deny from all
+       </Directory>
 
        SetEnv GITWEB_CONFIG /etc/gitweb-fsij.conf
        ServerSignature On
index ad8e8f9..1a7a3b6 100644 (file)
@@ -4,18 +4,26 @@
 
        DocumentRoot "/home/www/fsij-homepage-html/"
        <Directory "/home/www/fsij-homepage-html/">
-         Options Indexes FollowSymLinks MultiViews
+         DirectoryIndex index.html
+         Options None
          AllowOverride None
          Order allow,deny
          allow from all
        </Directory>
-
+       <Directory "/home/www/fsij-homepage-html/.git">
+         Options None
+         AllowOverride None
+         Order deny,allow
+         deny from all
+       </Directory>
        ServerSignature On
 
         LogLevel error
         ErrorLog /var/log/apache2/error-fsij.log
         CustomLog /var/log/apache2/access-fsij.log combined
 
-       RedirectMatch ^/wiki$ /wiki/FreeSoftwareInitiativeofJapan
-       Alias /favicon.ico /home/www/fsij-homepage-html/images/favicon.ico
+       # Historical
+       RedirectMatch ^/wiki$ /
+       RedirectMatch ^/gnuk/?$ /category/gnuk.html
+       RedirectMatch ^/monthly-meetings/?$ /category/monthly-meetings.html
 </VirtualHost>