diff --git a/README b/README index a6e696ba64b136ecca503b690bd28bfc81e7d74e..9cbb9510c680475d7880e92d8c3b632756ab6217 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -lodspeakr - Simple Publishing Kit for Linked Open Data +lodspeakr - Linked Open Data Simple Publishing Kit author: Alvaro Graves (alvaro@graves.cl) version: 20120223 @@ -7,7 +7,7 @@ Simplest Installation Just run - bash < <(curl -s http://lodspeakr.org/install) + bash < <(curl -sL http://lodspeakr.org/install) Alternative methods of installation available at diff --git a/install.sh b/install.sh index 1c142215d16706d26998360ec2fe25c53d8ed8a0..cae4d2a93ce6615c1f992971cf3d92f525445a55 100755 --- a/install.sh +++ b/install.sh @@ -113,20 +113,24 @@ echo "Created new configuration file: $settings_file" echo "" echo "WARNING: Copying $root_htaccess as .htaccess in parent directory" echo "" -cp $root_htaccess $parent_htaccess - +echo "RewriteEngine on" > $parent_htaccess +echo >> $parent_htaccess +echo "RewriteRule ^\$ $1/index.php [L]" >> $parent_htaccess +cat $root_htaccess >> $parent_htaccess +echo "RewriteRule ^(.+)\$ $1/index.php?q=\$1 [L]" >> $parent_htaccess mkdir cache + echo echo " *** ATTENTION ***" echo -echo "LODSPeaKr needs the web server to have write permissions for lodspeakr/cache/ and lodspeakr/meta/." +echo "LODSPeaKr needs the web server to have write permissions for $1/cache/ and $1/meta/." echo echo echo "Common ways of doing this:" -echo " chown -R www-apache lodspeakr/cache lodspeakr/meta (find the name of the apache user in your system)" -echo " chmod -R g+w lodspeakr/cache lodspeakr/meta (if you have a group in common with the apache user)" -echo " chmod -R 777 lodspeakr/cache lodspeakr/meta (highly discouraged but useful to test when everything fails. It shouldn't be used in production sites)" +echo " chown -R www-apache $1/cache $1/meta (find the name of the apache user in your system)" +echo " chmod -R g+w $1/cache $1/meta (if you have a group in common with the apache user)" +echo " chmod -R 777 $1/cache $1/meta (highly discouraged but useful to test when everything fails. It shouldn't be used in production sites)" echo echo "Please give the server write permissions. Otherwise, LODSPeaKr will not work." echo diff --git a/root.htaccess b/root.htaccess index d782c9601bc2287282286705ecd267916a2c11cc..bee4ad3061cadaba0f7d5949ca3135a587c3a120 100644 --- a/root.htaccess +++ b/root.htaccess @@ -5,4 +5,4 @@ RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{SCRIPT_FILENAME} !.*/index.php$ -RewriteRule ^(.+)$ lodspeakr/index.php?q=$1 [L] + diff --git a/utils/install b/utils/install index 29935f55980c9422e4f73ee8790ad5cfe2373b9c..c0bd38ef5aacbd057e281ab1498a23a9bdb404c8 100644 --- a/utils/install +++ b/utils/install @@ -1,7 +1,12 @@ #!/usr/bin/env bash +# # Installation script for LODSPeaKr (http://lodspeakr.org) # Author: Alvaro Graves (alvaro@graves.cl) # Modified by: Tim Lebo (lebot@rpi.edu) +# +# The URL: +# http://lodspeakr.org/install +# 303 redirects to this script. lodspeakr_repository="git://github.com/alangrafu/lodspeakr.git" home=`basename $lodspeakr_repository | sed 's/.git//'` @@ -17,7 +22,7 @@ fi if [ ! -e "$home" ]; then $GIT clone $lodspeakr_repository cd $home - ./install.sh -else + ./install.sh $home + else echo "There is already an existing directory called '$home'. Installation cancelled. Remove it first and try again." fi