Merge pull request #1638 from brecke/fix-pdfjs-version

Fix pdfjs version

.circleci/config.yml

@@ -48,7 +48,7 @@ jobs:
             apk add --update --no-cache docker py-pip
             pip install docker-compose
       - run:
-          name: Create the containers (except for pdf2htmlex)
+          name: Create the containers
           command: docker-compose up --no-start --build oae-cassandra oae-redis oae-rabbitmq oae-elasticsearch oae-hilary
       - run:
           name: Start the containers we need

.gitignore

@@ -1,7 +1,7 @@
 /dump.rdb
 *.log
 doc_data.txt
-/node_modules/*
+node_modules
 .DS_Store
 tmp
 .nyc_output

README.md

@@ -24,8 +24,6 @@ Hilary is the back-end for the [Open Academic Environment](http://www.oaeproject
 
 ## Install
 
-If you're looking to install the OAE project the hard way (not recommended), check out [this page](https://github.com/brecke/Hilary/wiki/Manual-installation-&-setup) and then go the the [Setup section](#setup) below. If not, read along.
-
 This guide will install OAE locally for a development setup. Node is required on the host machine whereas the remaining servers will run as docker containers.
 
 ### Docker Quickstart Guide
@@ -147,8 +145,6 @@ server 192.168.1.2:2001; # assuming 192.168.1.2 is the external network IP addre
 ...
 ```
 
-Also, don't forget that running `Hilary` locally implies installing several other packages, namely `soffice` (libreoffice), `pdftotext` and `pdf2htmlEX`. You can find instructions on how to do this [here](https://github.com/brecke/Hilary/wiki/Manual-installation-&-setup). If you can't get pdf2htmlEX installed on your system, you may use a docker container instead, by replacing the `config.previews.pdf2htmlEX.binary` setting to `docker-compose run --rm oae-pdf2htmlex pdf2htmlEX`. On mac osx you can find all three in homebrew.
-
 #### Run the server and the containers
 
 Now run `docker-compose up -d oae-cassandra oae-redis oae-rabbitmq oae-elasticsearch oae-etherpad` and then `docker-compose logs -f` to check the logs. You may then run `nodemon app.js | bunyan` (or `npm start` for short) locally on the terminal to start the server.

config.js

@@ -277,16 +277,10 @@ config.mq = {
  * @param  {Object}      office                         Holds the configuration for anything Office related
  * @param  {String}      office.binary                  The path to the 'soffice' binary that starts up Libre Office. ex: On OS X it is `/Applications/LibreOffice.app/Contents/MacOS/soffice` with a default install
  * @param  {Number}      office.timeout                 Defines the timeout (in ms) when the Office process should be killed
- * @param  {Object}      pdf2htmlEX                     Holds the configuration for anything related to converting a PDF file into an HTML file
- * @param  {String}      pdf2htmlEX.binary              The path to the `pdf2htmlEX` binary that can be used to convert a PDF file into an HTML file
- * @param  {Number}      pdf2htmlEX.timeout             Defines the timeout (in ms) when the pdf2htmlEX process should be killed
- * @param  {Object}      pdftotext                      Holds the configuration for anything related to converting a PDF file into a text file
- * @param  {String}      pdftotext.binary               The path to the `pdftotext` binary that can be used to convert a PDF file into a text file
- * @param  {Number}      pdftotext.timeout              Defines the timeout (in ms) when the pdftotext process should be killed
- * @param  {Object}      link                           Holds the configuration for anything related to link processing
- * @param  {String}      link.renderDelay               Defines the timeout (in ms) that should be waited between loading the page and taking a screenshot
- * @param  {Number}      link.renderTimeout             Defines the timeout (in ms) when the screencapturing should be stopped. This should include the renderDelay
- * @param  {Number}      link.embeddableCheckTimeout    Defines the timeout (in ms) when the embeddable link check should be stopped
+ * @param  {Object}      pdfPreview                     Holds the configuration for pdfjs
+ * @param  {String}      pdfPreview.viewportScale       Defines the scale for the viewport when generating svg from PDFs
+ * @param  {Object}      screenShotting                 Holds the configuration for puppeteer.js
+ * @param  {Number}      screenShotting.timeout         Defines the timeout in ms for puppeteer to take screenshots
  * @param  {Object}      credentials                    Holds the credentials that can be used to log on the global admin server
  * @param  {String}      credentials.username           The username to login with on the global admin server
  * @param  {String}      credentials.password           The password to login with on the global admin server
@@ -296,7 +290,7 @@ config.previews = {
   tmpDir: Path.join(tmpDir, 'previews'),
   office: {
     /* if on mac osx change next line to '/Applications/LibreOffice.app/Contents/MacOS/soffice' */
-    binary: '/Applications/LibreOffice.app/Contents/MacOS/soffice',
+    binary: 'soffice',
     timeout: 120000
   },
   pdfPreview: {

docker-compose.yml

@@ -61,15 +61,6 @@ services:
       - .:/usr/src/Hilary
     cap_add:
       - SYS_ADMIN
-  oae-pdf2htmlex: # this is for dev only
-    container_name: oae-pdf2htmlex
-    image: oaeproject/oae-pdf2htmlex-docker:v0.1
-    restart: always
-    networks:
-      - my_network
-    tty: false
-    volumes:
-      - ${TMP}:${TMP}
   oae-redis:
     container_name: oae-redis
     image: redis:3.2.8-alpine
@@ -127,8 +118,8 @@ services:
     networks:
       - my_network
     ports:
-      - 9161:9160
-      - 9043:9042
+      - 9160:9160
+      - 9042:9042
     tty: false
     volumes:
       - ../data/cassandra:/var/lib/cassandra