dataflow
diff --git a/‎README.txt
Lines changed: 5 additions & 112 deletions b/‎README.txt
Lines changed: 5 additions & 112 deletions
diff --git a/‎development-jenkins.ini
Lines changed: 20 additions & 6 deletions b/‎development-jenkins.ini
Lines changed: 20 additions & 6 deletions
diff --git a/‎development.ini
Lines changed: 51 additions & 10 deletions b/‎development.ini
Lines changed: 51 additions & 10 deletions
@@ -8,118 +8,11 @@ RDF-enhanced storage API, pairtree-backed.
 Installation and dependancies
 =============================
 
--  [I would advise using virtualenv]
+The dependancies are listed in the file docs/Dependancies.pdf
+The installation instructions are available at docs/Databank_VM_Installation.txt
 
-Dependancies:
+For further infromation visit http://www.dataflow.ox.ac.uk/
+The project wiki is available at http://dataflow-jira.bodleian.ox.ac.uk/jira/ or 
+https://damssupport.ouls.ox.ac.uk/trac/databank/wiki/
 
-pylons==0.9.7
-pairtree==0.5.6-T
-rdfobject
-recordsilo
-simplejson
-solrpy
-
-redis (use the redis client that is compatible with your redis server - http://github.com/andymccurdy/redis-py/)
-
-
--  Change the settings in development.ini to suit your uses, specifically:
-
-redis.host = localhost
-
-granary.store = silos  # Directory to storage directory. Can be absolute: /var/silos
-granary.uri_root = http://databank.bodleian.ox.ac.uk/objects/ # URI root - must end with /, # or :
-
-broadcast.to = redis    
-broadcast.queue = silochanges  # redis 'queue' to push audit messages to (create, delete, update or embargo change)
-
-solr.host = http://localhost:8983/solr   # Unset this to ignore solr while testing
-
-Setup:
-======
-
-Create a file 'passwd' in the root directory of the application using 'htpasswd' or similar:
-
-$ htpasswd -c passwd admin
-[enter admin password]
-
-Add any users you wish to access or work with this application.
-
-Edit ./rdfdatabank/lib/ident_md.py - this has a variable _DATA which would best be replaced by a DB lookup or similar. For now, adjust it
-to suit your users - the important thing is the 'role'.
-
-Start up the redis-server and confirm that you can access it.
-
-You should be able to start the application now (as long as the application has access to r+w to the aforementioned 'silos' directory.)
-
-paster serve development.ini
-
-Then, go to localhost:5000/admin, and try to log in as the 'admin' account. You should then be able to create and manage silos and assign write-access to them to users.
-
-WGSI deployment:
-================
-
-Copy 'development.ini' to a file called 'production.ini' and make sure debug = false and that the 'silos' directory is
-owned by the web-server user (www-data for example). Recommendation is to have a separate silo directory for production use.
-
-Create a folder called 'egg-cache' and make sure that is writable by the web-server user too.
-
-Create a folder 'mod_wsgi' in the root of the application.
-
-Create a file within that called 'dispatch.wsgi' and put in the following:
-
----------------
-# Add the virtual Python environment site-packages directory to the path
-
-import pkg_resources
-pkg_resources.working_set.add_entry('/opt/rdfdatabank/src')    # Path to application root
-
-# Avoid ``[Errno 13] Permission denied: '/var/www/.python-eggs'`` messages
-import os
-os.environ['PYTHON_EGG_CACHE'] = '/opt/rdfdatabank/src/egg-cache'   # Path to writable directory for egg-cache
-
-# Load the Pylons application
-from paste.deploy import loadapp
-application = loadapp('config:/opt/rdfdatabank/src/production.ini')  #  Path to production.ini file
-
----------------
-
-In your apache2 configuration, you need an entry like:
-
-<VirtualHost *:80>
-    ServerName foo.com
-
-    # Logfiles
-    ErrorLog  /opt/rdfdatabank/apachelog/error.log
-    CustomLog /opt/rdfdatabank/apachelog/access.log combined
- 
-    # Use only 1 Python sub-interpreter.  Multiple sub-interpreters
-    # play badly with C extensions.
-    WSGIApplicationGroup %{GLOBAL}
-    WSGIPassAuthorization On
-    # Setup mod_wsgi
-    WSGIScriptAlias / /opt/rdfdatabank/src/mod_wsgi/dispatch.wsgi
-
-    <Directory /opt/rdfdatabank/src/mod_wsgi>
-    Order deny,allow
-    Allow from all
-    </Directory>
-
-</VirtualHost>
-
-Note the WSGIScriptAlias points to the dispatch.wsgi file.
-
----------------
-
-Note about permissions:
-src directory and all its files and directories:
-    Set the owner as admin_user:www-data
-    Set the permission to 775 on all directories and everything under it
-    set the owner as www-data:www-data for src/data folder
-    Set the permission to 644 on all files
-apachelog directory and all its files and directories:
-    Set the owner as admin_user:www-data
-    Set the persmissions 755 (currently the dir permission is set to 755 and the permission of the files within it is set to 644)
-All of other directories:
-    Set the owner as admin_user:admin_user
-    Set the permission to 775 on all directories and everything under it
 
@@ -8,7 +8,7 @@ debug = false
 # Uncomment and replace with the address which should receive any error reports
 #email_to = [email protected]
 smtp_server = localhost
-error_email_from = paste@localhost
+error_email_from = paste@jenkins
 
 [server:main]
 use = egg:Paste#http
@@ -30,14 +30,22 @@ beaker.session.secret = somesecret
 
 who.config_file = %(here)s/who.ini
 who.log_level = info
-who.log_file = stdout
+who.log_file = /var/log/databank/who.log
+#who.log_file = %(here)s/logs/who.log
+#who.log_file = stdout
 
 redis.host = localhost
 
 granary.store = %(here)s/silos
 granary.uri_root = http://dataflow-jenkins.bodleian.ox.ac.uk/
 #granary.uri_root = http://163.1.127.173/
 
+auth.file = %(here)s/passwd
+auth.info = %(here)s/rdfdatabank/config/users.py
+
+doi.config = %(here)s/rdfdatabank/config/doi_config.py
+doi.count = %(here)s/rdfdatabank/config/doi_count
+
 broadcast.to = redis
 broadcast.queue = silochanges
 
@@ -66,24 +74,24 @@ license =
 keys = root, routes, rdfdatabank
 
 [handlers]
-keys = console
+keys = console, logfile
 
 [formatters]
 keys = generic
 
 [logger_root]
 level = INFO
-handlers = console
+handlers = logfile
 
 [logger_routes]
 level = INFO
-handlers =
+handlers = logfile
 qualname = routes.middleware
 # "level = DEBUG" logs the route matched and routing variables.
 
 [logger_rdfdatabank]
 level = DEBUG
-handlers =
+handlers = logfile
 qualname = rdfdatabank
 
 [handler_console]
@@ -92,6 +100,12 @@ args = (sys.stderr,)
 level = NOTSET
 formatter = generic
 
+[handler_logfile]
+class = FileHandler
+level = INFO
+formatter = generic
+args = ('/var/log/databank/databank.log', 'w')
+
 [formatter_generic]
 format = %(asctime)s,%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %H:%M:%S
@@ -1,19 +1,43 @@
+# Copyright (c) 2012 University of Oxford
+# 
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, --INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 # rdfdatabank - Pylons development environment configuration
 #
 # The %(here)s variable will be replaced with the parent directory of this file
 #
 [DEFAULT]
-debug = false
+debug = true
 # Uncomment and replace with the address which should receive any error reports
 #email_to = [email protected]
 smtp_server = localhost
-error_email_from = paste@localhost
+error_email_from = paste@databank
 
 [server:main]
 use = egg:Paste#http
-host = 192.168.23.133
-port = 3000
+#Use these setings to run pylons using mod_wsgi and apache
+#host = 127.0.0.1
+#port = 5000
+#Use these settings tp run pylons from the commandline
+host = 0.0.0.0
+port = 80
 
 [app:main]
 use = egg:rdfdatabank
@@ -26,24 +50,35 @@ beaker.session.secret = somesecret
 
 who.config_file = %(here)s/who.ini
 who.log_level = info
+#who.log_file = /var/log/databank/who.log
 who.log_file = stdout
+#who.log_file = %(here)s/logs/who.log
 
 redis.host = localhost
 
 granary.store = %(here)s/silos
-#granary.store = ../silos
-#granary.uri_root = http://192.168.13.128/datasets/
-granary.uri_root = http://192.168.23.133/
+granary.uri_root = http://databank-vm1.oerc.ox.ac.uk/
+
+profile.log_filename = %(here)s/logs/profile.log
+profile.path = /__profile__
+
+auth.file = %(here)s/passwd
+auth.info = %(here)s/rdfdatabank/config/users.py
+
+doi.config = %(here)s/rdfdatabank/config/doi_config.py
+doi.count = %(here)s/rdfdatabank/config/doi_count
 
 broadcast.to = redis
 broadcast.queue = silochanges
 
+metadata.embargoed = False
+
 solr.host = http://localhost:8080/solr
 naming_rule = [^0-9a-zA-Z_\-\:]
 formats_served = text/html,text/xhtml,text/plain,application/json,application/rdf+xml,text/xml,text/rdf+n3,application/x-turtle,text/rdf+ntriples,text/rdf+nt
 publisher = Bodleian Libraries, University of Oxford
 rights = http://ora.ouls.ox.ac.uk/objects/uuid%3A1d00eebb-8fed-46ad-8e38-45dbdb4b224c
-license =
+license = CC0 1.0 Universal (CC0 1.0). See http://creativecommons.org/publicdomain/zero/1.0/legalcode
 #license = Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License. See http://creativecommons.org/licenses/by-nc-sa/3.0/
 
 # If you'd like to fine-tune the individual locations of the cache data dirs
@@ -57,13 +92,12 @@ license =
 # execute malicious code after an exception is raised.
 #set debug = false
 
-
 # Logging configuration
 [loggers]
 keys = root, routes, rdfdatabank
 
 [handlers]
-keys = console
+keys = console, logfile
 
 [formatters]
 keys = generic
@@ -89,6 +123,13 @@ args = (sys.stderr,)
 level = NOTSET
 formatter = generic
 
+[handler_logfile]
+class = FileHandler
+level = INFO
+formatter = generic
+args = ('/var/log/databank/databank.log', 'w')
+#args = ('%(here)s/logs/databank.log', 'w')
+
 [formatter_generic]
 format = %(asctime)s,%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %H:%M:%S