andis/intern2020
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stuff

Browse Source
This commit is contained in:
Andreas Stephanides
2021-05-02 14:50:51 +00:00
parent a97731930a
commit 23f62bb6f6
4 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile.etherpad
View File

@@ -1,3 +1,8 @@
from etherpad/etherpad from etherpad/etherpad
run npm install ep_headerauth ep_fileupload && npm install ep_headings2 ep_markdown ep_font_color ep_set_title_on_pad ep_image_upload ep_embedded_hyperlinks2 ep_fileupload ep_linkify run npm install npm uninstall node-pre-gyp --save && \
npm install @mapbox/node-pre-gyp --save
run npm install sqlite3@4
run npm install ep_headerauth@1.1.7
run npm install ep_image_upload@1.0.32
run npm install ep_headings2 ep_align ep_font_color ep_embedded_hyperlinks2
copy services/etherpad/settings.json.docker ./settings.json copy services/etherpad/settings.json.docker ./settings.json

12
Dockerfile_copy.etherpad Normal file
View File

@@ -0,0 +1,12 @@
from etherpad/etherpad
run npm install --unsafe-perm sqlite3@4.2.0
run npm install ep_headings2 ep_markdown ep_comments_page ep_align ep_font_color ep_webrtc ep_embedded_hyperlinks2
run npm install ep_headerauth
copy services/etherpad/settings.json.docker ./settings.json
user root
run apt-get update && apt-get install -y sqlite3 python3 build-essential
run npm update node
run npm i -g npm-upgrade && npm install sqlite3
run npm install ep_headings2 ep_markdown ep_comments_page ep_align ep_font_color ep_webrtc ep_embedded_hyperlinks2

4
build_push_etherpad
View File

@@ -2,5 +2,5 @@
export REGISTRY="docker.triton2.fet.at" export REGISTRY="docker.triton2.fet.at"
# Build a development Image with Theia and all content # Build a development Image with Theia and all content
docker build -f Dockerfile.etherpad -t $REGISTRY/etherpad:latest . docker build --no-cache -f Dockerfile.etherpad -t $REGISTRY/etherpad:latest .
docker push $REGISTRY/etherpad docker push $REGISTRY/etherpad:latest

13
services/etherpad/settings.json.docker
View File

@@ -424,12 +424,13 @@
* If you want to mitigate this, please install ep_hash_auth and * If you want to mitigate this, please install ep_hash_auth and
* follow the section "secure your installation" in README.md * follow the section "secure your installation" in README.md
*/ */
"headerauth": { /*
// Defaults to "x-authenticated-user" * "headerauth": {
"username_header": "x-authenticated-user", * // Defaults to "x-authenticated-user"
// Defaults to "x-authenticated-name" * "username_header": "x-authenticated-user",
"displayname_header": "x-authenticated-user" * // Defaults to "x-authenticated-name"
}, * "displayname_header": "x-authenticated-user"
},*/
"ep_image_upload": { "ep_image_upload": {
"fileTypes": ["jpeg", "jpg", "bmp", "gif", "png"], "fileTypes": ["jpeg", "jpg", "bmp", "gif", "png"],
"maxFileSize": 12000000 "maxFileSize": 12000000