First pass over INSTALL, some file renames

3 files changed, 47 insertions, 49 deletions

diff --git a/etc/brep-apache2.conf b/etc/brep-apache2.conf
index bd8cd0c..189216c 100644
--- a/etc/brep-apache2.conf
+++ b/etc/brep-apache2.conf
@@ -1,49 +1,47 @@
-# The brep.conf file can be included once into Apache configuration file in
-# the <VirtualHost> section or in the main server context.
+# Paste the following fragment into your <VirtualHost> section (it is the same
+# as what you find in the INSTALL file).
 #
-LoadModule brep_module modules/mod_brep.so
-LoadModule alias_module modules/mod_alias.so
-
-# Alternatively, if loading the modules in another place, make sure they
-# are loaded.
-#
-<IfModule !brep_module>
-  Error "mod_brep is not loaded"
-</IfModule>
-
-<IfModule !alias_module>
-  Error "mod_alias is not loaded"
-</IfModule>  
-
-# To use a repository root other than /pkg/, replace all occurrences of
-# /pkg/ with the desired alternative root (use '/' for webserver root).
-#
-brep-root                /pkg/
-brep-db-host             localhost
-brep-db-port             5432
-brep-search-results      10
-brep-search-pages        5
-brep-package-description 500
-brep-package-changes     5000
-brep-verbosity           0
-
-# To override brep module options place them into the separate configuration
-# file, suppressing the "brep-" prefix.
-#
-#brep-conf /path/to/brep-site.conf
-
-SetHandler brep
-
-# Location of the brep static content (CSS files).
-#
-Alias /pkg/@/ /usr/share/brep/static/
-
-<Directory "/usr/share/brep/static">
-  Require all granted
-</Directory>
-
-# Serve repository files from the repository root path. For example:
-#
-#   http://example.org/pkg/1/...  -> /path/to/repo/1/...
-#
-#AliasMatch ^/pkg/(\d+)/(.+) /path/to/repo/$1/$2
+        
+        # Load the brep module.
+        #
+        LoadModule brep_module /home/brep/install/libexec/brep/mod_brep.so
+        SetHandler brep
+
+        # Repository root. This is the part of the URL between the host name
+        # and the start of the repository. For example, root value /pkg/ means
+	# the repository URL is http://example.org/pkg/. Specify / to use the
+        # web server root (e.g., http://example.org/). If using a different
+        # repository root, don't forget to also change Alias directives below.
+        #
+        brep-root /pkg/
+
+        # Brep module configuration. If you prefer, you can paste the contents
+        # of this file here. However, you will need to prefix every option with
+        # 'brep-'.
+        #
+        brep-conf /home/brep/config/brep-module.conf
+
+        # Static brep content (CSS files).
+        #
+        <IfModule !alias_module>
+          Error "mod_alias is not enabled"
+        </IfModule>
+
+	# Note: trailing slashes are important!
+        #
+        Alias /pkg/@/ /home/brep/install/share/brep/www/
+
+        <Directory "/home/brep/install/share/brep/www">
+            Require all granted
+        </Directory>
+
+        # You can also serve the repository files from the repository root.
+        # For example:
+        #
+        #   http://example.org/pkg/1/...  -> /path/to/repo/1/...
+        #
+        #AliasMatch ^/pkg/(\d+)/(.+) /path/to/repo/$1/$2
+        #
+        #<Directory "/path/to/repo">
+        #    Require all granted
+        #</Directory>
diff --git a/etc/brep.conf b/etc/brep-module.conf
index 26767d6..26767d6 100644
--- a/etc/brep.conf
+++ b/etc/brep-module.conf
diff --git a/etc/buildfile b/etc/buildfile
index ea96623..fc192b6 100644
--- a/etc/buildfile
+++ b/etc/buildfile
@@ -6,4 +6,4 @@ define conf: file
 conf{*}: extension = conf
 conf{*}: install = data/etc
 
-./: conf{brep}
+./: conf{brep-module brep-apache2}