Linked in the permissions script.

Added a comment to INSTALL.mir to invoke build.sh as root.

diff --git a/build.sh-dist b/build.sh-dist
index 8afa4c7..350c146 100755 (executable)
--- a/build.sh-dist
+++ b/build.sh-dist
@@ -34,3 +34,6 @@ ANT_HOME=LIB_HOME             # use mir-ant
 # Execute ANT to perform the requested build target
 $JAVA_HOME/bin/java -classpath $CP:$CLASSPATH org.apache.tools.ant.Main \
   -Dtomcat.home=$TOMCAT_HOME "$@"
+
+# Set permissions correctly
+./perms.sh-dist

diff --git a/doc/INSTALL.mir b/doc/INSTALL.mir
index 4e255ad..3d04d79 100755 (executable)
--- a/doc/INSTALL.mir
+++ b/doc/INSTALL.mir
@@ -28,10 +28,6 @@ CVS CHECKOUT:
 
 now customize config.properties for your needs.
 
-    modify etc/web.xml to change the xml-config
-    parameter to point to where your server.xml file is
-    (in ../Mir i.e /path/to/Mir/server.xml)
-
 
 3. configure the build.sh file with java_home
         cp build.sh-dist build.sh 
@@ -41,7 +37,9 @@ now customize config.properties for your needs.
 4. copy the mir/templates-dist-directory to mir/templates
 
 
-5. compile
+5. compile (do this as root so the permissions script is able to set
+the permissions and owners correctly).
+
        sh build.sh 
 
 
@@ -143,21 +141,6 @@ If you can't access PostgreSQL after this for any reason, try to change
 "password" in /etc/postgresql/pg_hba.conf into "trust". This should disable
 any authentication method and make the database accessible again.
 
-15. configure apache's mod_mime to recognize .m3u and .pls files:
-
-The web server (of the media host) must recognize the .m3u and .pls file
-extensions and send the proper "audio/x-mpegurl" and "audio/x-scpls" mime-types
-respectively.  If the web server is apache, it's easy, just add:
-           *
-audio/x-mpegurl                 m3u
-audio/x-scpl                    pls
-              *
-to the file pointed to by the "TypesConfig" command in your apache config file.
-Or add and equivalent AddType command to your httpd.conf.  Of course this
-assumes that the mod_mime is loaded.
-                   *
-If the web server is not apache, then your on your own.
-
 that's it :)
 
 now the admin-application is accesable via:  

diff --git a/perms.sh-dist b/perms.sh-dist
index fb619ff..e373726 100755 (executable)
--- a/perms.sh-dist
+++ b/perms.sh-dist
@@ -45,3 +45,5 @@ chgrp $GROUP $INSTDIR -R > /dev/null 2>&1
 grant 775 664 $INSTDIR > /dev/null 2>&1
 grant 750 640 $INSTDIR/WEB-INF/classes/config.properties
 grant 740 640 $INSTDIR/src/config.properties
+
+echo "Permissions set."
\ No newline at end of file