diff options
| author | Joe Rayhawk <jrayhawk@omgwallhack.org> | 2011-04-24 13:00:05 -0700 |
|---|---|---|
| committer | Joe Rayhawk <jrayhawk@omgwallhack.org> | 2011-04-24 13:00:05 -0700 |
| commit | ffab3ec34b9fd949a9877d0a19182b58911424da (patch) | |
| tree | 102fb78c332d7c43d5c3671e4de59bcba25134ca /pinyconfigs | |
| parent | 4ac0fd01b73a0b718db3a756866fee121a1615f1 (diff) | |
| parent | 2a27be477f89b42abb23793c5118b40120b793aa (diff) | |
| download | piny-code-ffab3ec34b9fd949a9877d0a19182b58911424da.tar.gz piny-code-ffab3ec34b9fd949a9877d0a19182b58911424da.zip | |
Merge branch 'master' of piny.be:/srv/git/piny-code
Conflicts:
libpiny/lib/Piny/Repo.pm
Diffstat (limited to 'pinyconfigs')
| -rw-r--r-- | pinyconfigs/etc/apache2/sites-available/piny | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pinyconfigs/etc/apache2/sites-available/piny b/pinyconfigs/etc/apache2/sites-available/piny index a8e69d3..691c238 100644 --- a/pinyconfigs/etc/apache2/sites-available/piny +++ b/pinyconfigs/etc/apache2/sites-available/piny @@ -10,7 +10,7 @@ Alias /js /usr/share/javascript - RedirectMatch 301 ^/$ http://piny.be/piny-web/ + RedirectMatch 301 ^/$ http://piny.be/piny-hosting/ </VirtualHost> <VirtualHost *:80> @@ -29,7 +29,7 @@ Alias /js /usr/share/javascript - RedirectMatch 301 ^/$ http://piny.be/piny-web/ + RedirectMatch 301 ^/$ http://piny.be/piny-hosting/ SSLEngine On SSLCertificateFile /etc/ssl/private/secure.piny.be.pem |