diff --git a/README b/README index 9a928a5f1cc33098c0730c8e1b8524b7ae17754d..fa089b51f76f7e8b54d2a57ddafca80263c135ac 100644 --- a/README +++ b/README @@ -1,3 +1,5 @@ # This is the base directory of the OSUG-DOI project +# to build project, just run: +mvn clean install -DskipTests diff --git a/conf/CRYOBSCLIM_CDP/access_instruction.html b/conf/CRYOBSCLIM_CDP/access_instruction.html index 5c57fb76f1e297e6f75a90539f86786debf436ac..fdbc58909ccc2bab5fe326b1be4034b63d5ac867 100644 --- a/conf/CRYOBSCLIM_CDP/access_instruction.html +++ b/conf/CRYOBSCLIM_CDP/access_instruction.html @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <html xmlns="http://www.w3.org/1999/xhtml"> <body> - The data can be accessed from the link on this page. You will then be directed to the public OSUG ownCloud to download data files. + To download corresponding data files, please use the following link: </body> </html> diff --git a/conf/CRYOBSCLIM_CDP/doi_url_data_access.csv b/conf/CRYOBSCLIM_CDP/doi_url_data_access.csv index 61137c84a21205ce91859dc61ff82e9a6a415be5..a1d318a8d9aa586cebf7454977b8b5845ad6f5e2 100644 --- a/conf/CRYOBSCLIM_CDP/doi_url_data_access.csv +++ b/conf/CRYOBSCLIM_CDP/doi_url_data_access.csv @@ -1,9 +1,9 @@ # DOI_suffix;data_access_url -CRYOBSCLIM.CDP.2018.HourlySnow;https://owncloud.osug.fr/index.php/s/dEwsu2qciLB8tdc/download?path=/&files=CRYOBSCLIM.CDP.2018.HourlySnow.zip -CRYOBSCLIM.CDP.2018.MetInsitu;https://owncloud.osug.fr/index.php/s/dEwsu2qciLB8tdc/download?path=/&files=CRYOBSCLIM.CDP.2018.MetInsitu.zip -CRYOBSCLIM.CDP.2018.MetSafran;https://owncloud.osug.fr/index.php/s/dEwsu2qciLB8tdc/download?path=/&files=CRYOBSCLIM.CDP.2018.MetSafran.zip -CRYOBSCLIM.CDP.2018.MetSnowDaily;https://owncloud.osug.fr/index.php/s/dEwsu2qciLB8tdc/download?path=/&files=CRYOBSCLIM.CDP.2018.MetSnowDaily.zip -CRYOBSCLIM.CDP.2018.SnowProfile;https://owncloud.osug.fr/index.php/s/dEwsu2qciLB8tdc/download?path=/&files=CRYOBSCLIM.CDP.2018.SnowProfile.zip -CRYOBSCLIM.CDP.2018.Soil;https://owncloud.osug.fr/index.php/s/dEwsu2qciLB8tdc/download?path=/&files=CRYOBSCLIM.CDP.2018.Soil.zip -CRYOBSCLIM.CDP.2018.SolarMask;https://owncloud.osug.fr/index.php/s/dEwsu2qciLB8tdc/download?path=/&files=CRYOBSCLIM.CDP.2018.SolarMask.zip +CRYOBSCLIM.CDP.2018.HourlySnow;http://doi.osug.fr/data/public/CRYOBSCLIM_CDP/CRYOBSCLIM.CDP.2018.HourlySnow.zip +CRYOBSCLIM.CDP.2018.MetInsitu;http://doi.osug.fr/data/public/CRYOBSCLIM_CDP/CRYOBSCLIM.CDP.2018.MetInsitu.zip +CRYOBSCLIM.CDP.2018.MetSafran;http://doi.osug.fr/data/public/CRYOBSCLIM_CDP/CRYOBSCLIM.CDP.2018.MetSafran.zip +CRYOBSCLIM.CDP.2018.MetSnowDaily;http://doi.osug.fr/data/public/CRYOBSCLIM_CDP/CRYOBSCLIM.CDP.2018.MetSnowDaily.zip +CRYOBSCLIM.CDP.2018.SnowProfile;http://doi.osug.fr/data/public/CRYOBSCLIM_CDP/CRYOBSCLIM.CDP.2018.SnowProfile.zip +CRYOBSCLIM.CDP.2018.Soil;http://doi.osug.fr/data/public/CRYOBSCLIM_CDP/CRYOBSCLIM.CDP.2018.Soil.zip +CRYOBSCLIM.CDP.2018.SolarMask;http://doi.osug.fr/data/public/CRYOBSCLIM_CDP/CRYOBSCLIM.CDP.2018.SolarMask.zip diff --git a/conf/CRYOBSCLIM_CDP/project.properties b/conf/CRYOBSCLIM_CDP/project.properties index d646d1397ccd60dbb90f4c4b49e43507807cbce5..3dfc77e28ce6ccc806bf6e05c1a9417535ee445a 100644 --- a/conf/CRYOBSCLIM_CDP/project.properties +++ b/conf/CRYOBSCLIM_CDP/project.properties @@ -7,8 +7,7 @@ use_template_country=false use_template_doi=false # general data access URL: -# shared folder: /DOI/data/CRYOBSCLIM/CLP/ -dataAccessUrl=https://owncloud.osug.fr/index.php/s/dEwsu2qciLB8tdc +dataAccessUrl=http://doi.osug.fr/data/public/CRYOBSCLIM_CDP/ # enable / disable the generation of embeddedable fragments for landing pages: generate_embedded=false diff --git a/conf/CRYOBSCLIM_CLB/access_instruction.html b/conf/CRYOBSCLIM_CLB/access_instruction.html index 5c57fb76f1e297e6f75a90539f86786debf436ac..fdbc58909ccc2bab5fe326b1be4034b63d5ac867 100644 --- a/conf/CRYOBSCLIM_CLB/access_instruction.html +++ b/conf/CRYOBSCLIM_CLB/access_instruction.html @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <html xmlns="http://www.w3.org/1999/xhtml"> <body> - The data can be accessed from the link on this page. You will then be directed to the public OSUG ownCloud to download data files. + To download corresponding data files, please use the following link: </body> </html> diff --git a/conf/CRYOBSCLIM_CLB/doi_url_data_access.csv b/conf/CRYOBSCLIM_CLB/doi_url_data_access.csv index 7fd60110008fb737d4bd5f7359e3ca139488a33c..cde38df5374b987af180a18305e56f498f5a005e 100644 --- a/conf/CRYOBSCLIM_CLB/doi_url_data_access.csv +++ b/conf/CRYOBSCLIM_CLB/doi_url_data_access.csv @@ -1,9 +1,9 @@ # DOI_suffix;data_access_url -CRYOBSCLIM.CLB.BSO;https://owncloud.osug.fr/index.php/s/oeNlkTJpPZuy3Xi/download?path=/&files=CRYOBSCLIM.CLB.BSO.csv.zip -CRYOBSCLIM.CLB.COL;https://owncloud.osug.fr/index.php/s/oeNlkTJpPZuy3Xi/download?path=/&files=CRYOBSCLIM.CLB.COL.csv.zip -CRYOBSCLIM.CLB.DOME;https://owncloud.osug.fr/index.php/s/oeNlkTJpPZuy3Xi/download?path=/&files=CRYOBSCLIM.CLB.DOME.csv.zip -CRYOBSCLIM.CLB.DEM;https://owncloud.osug.fr/index.php/s/oeNlkTJpPZuy3Xi/download?path=/&files=CRYOBSCLIM.CLB.DEM.zip -CRYOBSCLIM.CLB.LACBLANC;https://owncloud.osug.fr/index.php/s/oeNlkTJpPZuy3Xi/download?path=/&files=CRYOBSCLIM.CLB.LACBLANC.csv.zip -CRYOBSCLIM.CLB.MUZELLE;https://owncloud.osug.fr/index.php/s/oeNlkTJpPZuy3Xi/download?path=/&files=CRYOBSCLIM.CLB.MUZELLE.csv.zip -CRYOBSCLIM.CLB.SAFRAN;https://owncloud.osug.fr/index.php/s/oeNlkTJpPZuy3Xi/download?path=/&files=CRYOBSCLIM.CLB.SAFRAN.csv.zip +CRYOBSCLIM.CLB.BSO;http://doi.osug.fr/data/public/CRYOBSCLIM_CLB/CRYOBSCLIM.CLB.BSO.csv.zip +CRYOBSCLIM.CLB.COL;http://doi.osug.fr/data/public/CRYOBSCLIM_CLB/CRYOBSCLIM.CLB.COL.csv.zip +CRYOBSCLIM.CLB.DOME;http://doi.osug.fr/data/public/CRYOBSCLIM_CLB/CRYOBSCLIM.CLB.DOME.csv.zip +CRYOBSCLIM.CLB.DEM;http://doi.osug.fr/data/public/CRYOBSCLIM_CLB/CRYOBSCLIM.CLB.DEM.zip +CRYOBSCLIM.CLB.LACBLANC;http://doi.osug.fr/data/public/CRYOBSCLIM_CLB/CRYOBSCLIM.CLB.LACBLANC.csv.zip +CRYOBSCLIM.CLB.MUZELLE;http://doi.osug.fr/data/public/CRYOBSCLIM_CLB/CRYOBSCLIM.CLB.MUZELLE.csv.zip +CRYOBSCLIM.CLB.SAFRAN;http://doi.osug.fr/data/public/CRYOBSCLIM_CLB/CRYOBSCLIM.CLB.SAFRAN.csv.zip diff --git a/conf/CRYOBSCLIM_CLB/project.properties b/conf/CRYOBSCLIM_CLB/project.properties index b42e35cb6edf9b259a1febc82ed7d4485f6fd61b..b97e891f86dfbcaba6e98b0387d410bb46355178 100644 --- a/conf/CRYOBSCLIM_CLB/project.properties +++ b/conf/CRYOBSCLIM_CLB/project.properties @@ -7,8 +7,7 @@ use_template_country=false use_template_doi=false # general data access URL: -# shared folder: /DOI/data/CRYOBSCLIM/CLB/ -dataAccessUrl=https://owncloud.osug.fr/index.php/s/oeNlkTJpPZuy3Xi +dataAccessUrl=http://doi.osug.fr/data/public/CRYOBSCLIM_CLB/ # enable / disable the generation of embeddedable fragments for landing pages: generate_embedded=false diff --git a/doc/setup_data.txt b/doc/setup_data.txt new file mode 100644 index 0000000000000000000000000000000000000000..d67ea13bea9d533160022a774ad3779ddcd1a977 --- /dev/null +++ b/doc/setup_data.txt @@ -0,0 +1,26 @@ +add-user data-doi (uid=1001, sid=1001) to have the NFS rights +(nologin home=/home/data-doi) + + mkdir /data-doi + chown data-doi:data-doi data-doi/ + +Mount NFS into /data-doi + +As user doi: + ln -s /data-doi/ /srv/doi/www/data + + +Edit /etc/apache2/sites-enabled/000-default.conf to enable directory listing: + + DocumentRoot /srv/doi/osug-doi/www + + <Directory /srv/doi/osug-doi/www/data> + Options Indexes FollowSymLinks + IndexOptions Charset=UTF-8 FancyIndexing SuppressHTMLPreamble SuppressColumnSorting SuppressDescription SuppressRules HTMLTable + HeaderName /include/HEADER.html + ReadmeName /include/FOOTER.html + Require all granted + </Directory> + + +Test at http://doi.osug.fr/data/