diff --git a/INSTALL b/INSTALL index f848445b4..b147f8dc8 100644 --- a/INSTALL +++ b/INSTALL @@ -2,9 +2,9 @@ ## Installing Plinth -Install the pandoc, python-augeas, and bjsonrpc: +Install the dependencies: -apt-get install augeas-tools libpython2.7 pandoc psmisc python2.7 python-augeas python-bcrypt python-bjsonrpc python-cherrypy3 python-django python-passlib python-simplejson python-bootstrapform libjs-twitter-bootstrap sudo +apt-get install augeas-tools libpython2.7 pandoc psmisc python2.7 python-augeas python-bcrypt python-cherrypy3 python-django python-passlib python-simplejson python-bootstrapform libjs-twitter-bootstrap sudo Unzip and untar the source into a directory. Change to the directory containing the program. Run: @@ -26,8 +26,6 @@ and the default password is "secret". * *GNU Make* is used to build the templates and such. -* bjsonrpc - used for configuration management layer - * python-augeas and augeas - used for configuration management The documentation has some dependencies too. diff --git a/Makefile b/Makefile index 428c03780..d1f1407c7 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ default: config dirs docs all: default predepend: - sudo sh -c "apt-get install augeas-tools libpython2.7 pandoc psmisc python2.7 python-augeas python-bcrypt python-bjsonrpc python-cherrypy3 python-django python-passlib python-simplejson python-bootstrapform libjs-twitter-bootstrap sudo" + sudo sh -c "apt-get install augeas-tools libpython2.7 pandoc psmisc python2.7 python-augeas python-bcrypt python-cherrypy3 python-django python-passlib python-simplejson python-bootstrapform libjs-twitter-bootstrap sudo" git submodule init git submodule update touch predepend diff --git a/fabfile.py b/fabfile.py index 8844179be..1f0887e38 100644 --- a/fabfile.py +++ b/fabfile.py @@ -150,7 +150,7 @@ def apache(): @task def deps(): "Basic plinth dependencies" - sudo('apt-get install --no-install-recommends -y python make pandoc python-simplejson python-pyme python-augeas python-bjsonrpc python-django python-bootstrapform libjs-twitter-bootstrap') + sudo('apt-get install --no-install-recommends -y python make pandoc python-simplejson python-pyme python-augeas python-django python-bootstrapform libjs-twitter-bootstrap') @task def update():