diff options
| author | joanofarctangent@gmail.com <iduffe@dev.piny.svcs.cs.pdx.edu> | 2011-01-18 18:51:35 -0800 |
|---|---|---|
| committer | joanofarctangent@gmail.com <iduffe@dev.piny.svcs.cs.pdx.edu> | 2011-01-18 18:51:35 -0800 |
| commit | 8203bf9c98833de59ba0c939566ce25ce53e2eb0 (patch) | |
| tree | b8edde28d20b366780db3ff09388145a684d082a /pinyconfigs | |
| parent | 666f8065cd416870d236ae2063dd836fb35d18a0 (diff) | |
| parent | 5e5c8b90363ff5460ee6eb9378a31f099d38aefe (diff) | |
| download | piny-code-8203bf9c98833de59ba0c939566ce25ce53e2eb0.tar.gz piny-code-8203bf9c98833de59ba0c939566ce25ce53e2eb0.zip | |
Merge branch 'master' of piny.be:/srv/git/piny-code
Diffstat (limited to 'pinyconfigs')
| -rw-r--r-- | pinyconfigs/debian/changelog | 6 | ||||
| -rw-r--r-- | pinyconfigs/debian/control | 2 | ||||
| -rw-r--r-- | pinyconfigs/etc/apache2/sites-available/piny | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/pinyconfigs/debian/changelog b/pinyconfigs/debian/changelog index 038fb49..c5fb6bf 100644 --- a/pinyconfigs/debian/changelog +++ b/pinyconfigs/debian/changelog @@ -1,3 +1,9 @@ +pinyconfigs (0.3) unstable; urgency=low + + * Depend on pinyweb. + + -- Julian Blake Kongslie <jblake@omgwallhack.org> Tue, 18 Jan 2011 17:55:46 -0800 + pinyconfigs (0.2) unstable; urgency=low * Standards version. diff --git a/pinyconfigs/debian/control b/pinyconfigs/debian/control index 1af1c86..cce693f 100644 --- a/pinyconfigs/debian/control +++ b/pinyconfigs/debian/control @@ -8,7 +8,7 @@ Standards-version: 3.9.1 Package: pinyconfigs Architecture: all -Depends: ${misc:Depends} +Depends: ${misc:Depends}, pinyweb (>= 0.8) Description: Configuration files for piny The configuration files needed for a piny configuration. . diff --git a/pinyconfigs/etc/apache2/sites-available/piny b/pinyconfigs/etc/apache2/sites-available/piny index 0904ea6..0e9be04 100644 --- a/pinyconfigs/etc/apache2/sites-available/piny +++ b/pinyconfigs/etc/apache2/sites-available/piny @@ -8,6 +8,8 @@ AllowOverride None </Directory> + Alias /js /usr/share/javascript + RedirectMatch 301 ^/$ http://piny.be/piny-web/ </VirtualHost> @@ -25,6 +27,8 @@ AllowOverride None </Directory> + Alias /js /usr/share/javascript + RedirectMatch 301 ^/$ http://piny.be/piny-web/ SSLEngine On @@ -60,6 +64,7 @@ ScriptAlias /cgit /usr/lib/cgi-bin/cgit.cgi ScriptAlias /piny-newuser /usr/lib/cgi-bin/piny/newuser.cgi + ScriptAlias /piny-validate /usr/lib/cgi-bin/piny/checkconstraint.cgi ScriptAlias /auth/ /usr/lib/cgi-bin/piny/auth/ Include /etc/apache2/piny-enabled |