Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

This commit is contained in:
Uwe Steinmann 2019-03-18 06:53:11 +01:00
commit d5109326f2

View File

@ -21,7 +21,7 @@ SeedDMS_Lucene, SeedDMS_Preview, SeedDMS_SQLiteFTS.
'seeddms-5.1.x' are the sources of seeddms and 'www' being a link on it. 'seeddms-5.1.x' are the sources of seeddms and 'www' being a link on it.
This layout has disadvantages when updating the source of seeddms, because This layout has disadvantages when updating the source of seeddms, because
the directories 'conf' and 'ext' has to be moved from 'seeddms-5.1.x' to the directories 'conf' and 'ext' had to be moved from 'seeddms-5.1.x' to
'seeddms-5.1.(x+1)'. 'conf' was also visible over the web unless it was 'seeddms-5.1.(x+1)'. 'conf' was also visible over the web unless it was
protected by an .htaccess file. The .htaccess file has been shipped, but it protected by an .htaccess file. The .htaccess file has been shipped, but it
is far better to keep senѕitive data out of the document root in the first is far better to keep senѕitive data out of the document root in the first
@ -31,9 +31,14 @@ The new layout mostly retains that structure but uses more soft links to place
the local data outside of 'seeddms-5.1.x' which makes updating a lot easier the local data outside of 'seeddms-5.1.x' which makes updating a lot easier
and moves the configuration out of the document root. and moves the configuration out of the document root.
As MS Windows does not support soft links, this change will only apply to Linux/Unix As MS Windows does not support soft links, this change will only apply to Linux/Unix
systems. The new layout is the following: systems. MS Windows users just skip all the soft links and set seeddms-5.1.x
as the document root. The new layout is the following:
seeddms51x ---+--- data --+-- log seeddms51x ---+--- data --+-- log
| |
| +-- cache
| |
| +-- 1048576
| | | |
| +-- ... | +-- ...
| |
@ -73,11 +78,16 @@ In order to convert to this layout you need to do the following in the seeddms51
directory (replace seeddms-5.1.x with you installed version of seeddms): directory (replace seeddms-5.1.x with you installed version of seeddms):
ln -s seeddms-5.1.x seeddms ln -s seeddms-5.1.x seeddms
<<<<<<< HEAD
mv seeddms-5.1.x/conf . mv seeddms-5.1.x/conf .
rm www rm www
mkdir www mkdir www
mv seeddms-5.1.x/ext www mv seeddms-5.1.x/ext www
=======
mv www/conf .
>>>>>>> seeddms-5.1.x
cd www cd www
rm inc op out views controllers styles languages webdav restapi pdfviewer index.php
ln -s ../seeddms/inc ln -s ../seeddms/inc
ln -s ../seeddms/op ln -s ../seeddms/op
ln -s ../seeddms/out ln -s ../seeddms/out