Changed some locations (again!) to follow draft web application policy.

diff --git a/Memories/Config.pm b/Memories/Config.pm
index 5a42acdb86501ec4be6ec126f43b13106a960fc9..8318369d3530040c8f841b1a1365f7117b34ac8b 100644 (file)
--- a/Memories/Config.pm
+++ b/Memories/Config.pm
@@ -3,19 +3,19 @@ package Memories::Config;
 
 # This parameter should be the external address of your Memories
 # installation
-Memories->config->uri_base("http://memories/");
+Memories->config->uri_base("http://localhost/memories/");
 
 # This is where your templates will live.
-Memories->config->{template_root} = "/usr/share/memories/templates/";
+Memories->config->{template_root} = "/etc/memories/templates/";
 
 # Here is where uploaded photos will be stored. Your web server user
 # should own this directory.
-Memories->config->{data_store} = "/srv/www/memories/store/";
+Memories->config->{data_store} = "/var/www/memories/store/";
 
 # You also need to configure your web server so that it serves files out
 # of the data store; this URL should be where that data store directory
 # is exposed on the web.
-Memories->config->{data_store_external} = "http://memories/store/";
+Memories->config->{data_store_external} = "http://localhost/memories/store/";
 
 # Your database server: the first part should always be "dbi"; the
 # second, the name of the DBD driver you're using (usually mysql unless

diff --git a/debian/apache.conf b/debian/apache.conf
new file mode 100644 (file)
index 0000000..ce7a40a
--- /dev/null
+++ b/debian/apache.conf
@@ -0,0 +1,18 @@
+PerlModule Memories
+
+Alias /memories/static/ /etc/memories/templates/static/
+Alias /memories/store/ /srv/www/memories/store/
+
+<Location /memories>
+    PerlHandler Memories
+    SetHandler perl-script
+</Location>
+
+#<VirtualHost memories>
+#    Alias /static/ /etc/memories/templates/static/
+#    Alias /store/ /srv/www/memories/store/
+#    <Location />
+#        PerlHandler Memories
+#        SetHandler perl-script
+#    </Location>
+#</VirtualHost>

diff --git a/debian/rules b/debian/rules
index 11a5c6d906b4eda83d5f1a9762922085d1dcbadf..0b207c433f45b5af5351608c11dff395676ecb50 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,14 +8,20 @@ binary-arch :
 
 binary-indep :
        dh_testroot
-       mkdir -p debian/memories/usr/share/perl5/Memories
+       install -d debian/memories/usr/share/perl5/Memories
        install Memories.pm debian/memories/usr/share/perl5/
        install Memories/*.pm debian/memories/usr/share/perl5/Memories/
-       mkdir -p debian/memories/etc
-       mv debian/memories/usr/share/perl5/Memories/Config.pm debian/memories/etc/
+       install -d debian/memories/etc/memories
+       mv debian/memories/usr/share/perl5/Memories/Config.pm debian/memories/etc/memories/
+       cp -dR templates debian/memories/etc/memories/
        ln -s /etc/memories/Config.pm debian/memories/usr/share/perl5/Memories/
-       mkdir -p debian/memories/usr/share/memories
-       install memories.sql tag_dates templates debian/memories/usr/share/memories/
+       install debian/apache.conf debian/memories/etc/memories/
+       install -d debian/memories/etc/apache/conf.d
+       ln -s ../../memories/apache.conf debian/memories/etc/apache/conf.d/memories
+       install -d debian/memories/usr/share/memories
+       install memories.sql tag_dates debian/memories/usr/share/memories/
+       install -d debian/memories/var/lib/memories
+       install -d -o www-data -g www-data -m 770 debian/memories/var/lib/memories/sessions debian/memories/var/lib/memories/sessionlock
        dh_perl
        dh_installchangelogs
        dh_installdocs