From 1f581ab819b937d0cf5681169e389330f3cc61ab Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Tue, 9 May 2017 13:31:45 +0200 Subject: [PATCH 1/3] delete empty files --- Fetmailalias, | 0 MyText, | 0 Nachname, | 0 Short, | 0 Vorname, | 0 test1 | 0 6 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Fetmailalias, delete mode 100644 MyText, delete mode 100644 Nachname, delete mode 100644 Short, delete mode 100644 Vorname, delete mode 100644 test1 diff --git a/Fetmailalias, b/Fetmailalias, deleted file mode 100644 index e69de29..0000000 diff --git a/MyText, b/MyText, deleted file mode 100644 index e69de29..0000000 diff --git a/Nachname, b/Nachname, deleted file mode 100644 index e69de29..0000000 diff --git a/Short, b/Short, deleted file mode 100644 index e69de29..0000000 diff --git a/Vorname, b/Vorname, deleted file mode 100644 index e69de29..0000000 diff --git a/test1 b/test1 deleted file mode 100644 index e69de29..0000000 From 6a9fe8243b4f70db725888936b3e7141c0aa5b8a Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Tue, 9 May 2017 13:38:32 +0200 Subject: [PATCH 2/3] fix apth for ETHERPAD Key --- app/models/document.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/document.rb b/app/models/document.rb index 5123b52..f674ada 100644 --- a/app/models/document.rb +++ b/app/models/document.rb @@ -24,7 +24,7 @@ class Document < ActiveRecord::Base "document_"+self.id.to_s end def self.ether - EtherpadLite.connect('http://www.fet.at/etherpad', File.new('/srv/etherpad/etherpad-lite/APIKEY.txt')) + EtherpadLite.connect('http://www.etherpad.fet.at', File.new('config/etherpad/APIKEY.txt')) end def create_pdf require "open3" From b5f1ae9e69b34af71c4b5ac4a71d6af38a6cded4 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Tue, 9 May 2017 13:39:52 +0200 Subject: [PATCH 3/3] APIKEY --- config/etherpad/APIKEY.txt.example | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 config/etherpad/APIKEY.txt.example diff --git a/config/etherpad/APIKEY.txt.example b/config/etherpad/APIKEY.txt.example new file mode 100644 index 0000000..e69de29