etherpad is still a mess but we will keep it at this state for now

4 files changed, 40 insertions, 53 deletions

diff --git a/dan/host_vars/sk-cloudia.yml b/dan/host_vars/sk-cloudia.yml
index 49740d46..9f425cfa 100644
--- a/dan/host_vars/sk-cloudia.yml
+++ b/dan/host_vars/sk-cloudia.yml
@@ -1,30 +1,35 @@
 $ANSIBLE_VAULT;1.2;AES256;dan
-35343436313330383232353966303231333938336435353363643864663238633166653839346264
-6339313431306438326535393365386638626361333836310a613838623439653736363933303732
-36613466353164316336663439336238623335343937633631383564313638623665383962666134
-3234313638613036320a616266333333316564386165653332363061303935386533336533363539
-34323635376464346330333238636133326536656332633535623532303638383262663165636464
-36633862666330333933383739336262633631303237623235373032303430616265643665623566
-32633735653438313939353938306638636239653137316663626237326635643235643661343164
-34636530393836333064343863623138353566313839363737373164343038663665333939643864
-30323733363366346465653930303937656632643634626630353939663262646230643339646231
-66636562303061616338303430346663306135353463663833613366666333613933353536313465
-31666163383863393830386261373136656138366132643461623864376366353535633533363334
-32373132653066383735313832343032316361623466313761353562366662663636386635353537
-30356161313737663332626363646133393330353862393466313437386561363564363236623839
-65396639303463633964363935643461633330613639373832343938346438346266366132323634
-62363366363133313833666165646635656265616437363138396162363438313130616635623964
-39343265336466646566643633643839386666613962633730336233396562316334613464633633
-30303561353866313163333962616539326335663736643832313030613761653037346135313633
-38336333333538396562663663303265313062633539626464353335366536363931616665643861
-62386366386138373338633132623262366436646161656335353334663438333630663165313262
-66383237636330373239376463346132363666386336313636626661663232303733633739386365
-39336130346630373831346135356630303632666233313531343663303439633130663538313537
-61336463343131616435373165663139346461646665343039633038343638313033366436613930
-32613437623539663264376364363230613232303238643061383738346462643032636431623565
-39376531353163366636393932623932393333633730653764376633326139663132353831373834
-39383932396637633232613334646161306336323365353961316464613662366432383232626235
-38653562623466396536393336643162363935333638353331653963653562336562643832353662
-33303065663036663361636162396336343262333232356563303832626133626165343965626166
-32616435313430663734656437613135616437636138646432663362353262346561616537313361
-6464
+34316363666331313262366132623662376565303936376365373665333164646663373934643738
+3962386638646137656665326331373837326264613238380a656665366466323134343131316565
+37656361343062326264643365653832336164376263333834313132393237653034316533396236
+3830623931663338300a326639316338313366383530633832363662663063356466626565643562
+65343366313030363338346332646239306137653334376630646239623334303964633839386564
+66366330376632613639333463646165323361633136623939643231353136626332353730623030
+32646232393537316336343161306366643236396234363331623136376431623930656563393266
+63653836636232333731333865383464333964313039616536383137663333376231323235353765
+38383066353061623562343663343436343439373566323539373334613337316338666334653164
+35623031643463363562333131663138643863633531636339336434376662323739636665663036
+37333561646530333033323038663064316239383364353434313565366235356135313663316435
+36373561303364313062343866343932656236666466356536363138343762316564633134393132
+32666431303263353437616232386435633230326163636363323364316639333538616266636630
+37333231373839636234616362653830313237386363613831653831663837656635613635663735
+32623564663633326336313163366238396132323039613039646435653431643436326231343461
+39386636356634376334656134306638393930383765643332396164373863363865633539373963
+38306665663461333030353037663630366139393833646134393965303930613331313937366536
+66663864653264336461393437343836353463346161666531393264383735303837333435316164
+38633961313730363232373066613333643161333235663639376339363635666232383131303839
+65653330303632386262323164643364363161393938386437643332643239393232643165383039
+64646165396431346133316561363063663133366362346364316664326363663133373838613135
+61363835666431623131663732346635353666393364303964383932636634353465643432303163
+37343165666266326665363833613539616563316264323731346565343163656635653465376439
+64373236326463316664666230633562656666653637316565633330363236623933623635323731
+31386333326239646436626532663432393436653430653861623433363434356630303130633231
+33643532633138626133623861313037636233306235323739646530353638343231663764346334
+35613065356432353462626230343837373963366331336135396664396365643638373166656332
+31336230306334643538623366316563356539643231366136623230346133646434383438626462
+32323164643938373230643035343761653565623533343336383761343662663866306436326538
+32383263383535386131393036383262386332616462643533303233616138653634326136373264
+31343763646464653233626363653864383165393764363531336364343833656137623163326362
+34636565613035646661356332376633653133373935313463613233623031613135653332663538
+64363136396365353765663663623233343030656530633337363162383139383631373062383332
+6638333033353335333164356262323066343965353864316331
diff --git a/inventory/host_vars/sk-cloudia/etherpad.yml b/inventory/host_vars/sk-cloudia/etherpad.yml
index 9cd26e19..9b6126e1 100644
--- a/inventory/host_vars/sk-cloudia/etherpad.yml
+++ b/inventory/host_vars/sk-cloudia/etherpad.yml
@@ -6,21 +6,20 @@ etherpad_lite_zfs:
 
 etherpad_lite_instances:
   pad.elevate.at:
-    version: 1.7.5
+    version: c65c5f17aa26c9179ce591f44721861ba6f6bec4-elevate
     port: 8300
     hostnames:
-#      - pad.elevate.at
-      - wolke.elev8.at
+      - pad.elevate.at
     quota: 5G
     settings:
       title: Elevate Etherpad
       users:
         admin:
           is_admin: true
-          password: admin
+          password: "{{ vault_etherpad_lite_user_passwords['pad.elevate.at']['admin'] }}"
         user:
           is_admin: false
-          password: user
+          password: "{{ vault_etherpad_lite_user_passwords['pad.elevate.at']['user'] }}"
 
       defaultPadText: "Welcome to the ELEVATE - Etherpad!\n\nThis pad text is synchronized\
         \ as you type, so that everyone viewing this page sees the same text. This allows\
@@ -44,8 +43,6 @@ etherpad_lite_instances:
       logconfig:
         appenders:
         - type: console
-
-    credentials:
       dbType: "mysql"
       dbSettings:
         host: "127.0.0.1"
diff --git a/roles/etherpad-lite/tasks/main.yml b/roles/etherpad-lite/tasks/main.yml
index 05bf32ce..6d4551db 100644
--- a/roles/etherpad-lite/tasks/main.yml
+++ b/roles/etherpad-lite/tasks/main.yml
@@ -90,17 +90,6 @@
   copy:
     content: "{{ item.value.settings | combine({'ip': '0.0.0.0', 'port': 9001}) | to_nice_json }}"
     dest: "{{ etherpad_lite_base_path }}/{{ item.key }}/config/settings.json"
-    mode: 0644
-    owner: "{{ etherpad_lite_app_uid }}"
-    group: "{{ etherpad_lite_app_gid }}"
-
-- name: create db credentials json
-  loop: "{{ etherpad_lite_instances | dict2items }}"
-  loop_control:
-    label: "{{ item.key }}"
-  copy:
-    content: "{{ item.value.credentials | to_nice_json }}"
-    dest: "{{ etherpad_lite_base_path }}/{{ item.key }}/config/credentials.json"
     mode: 0600
     owner: "{{ etherpad_lite_app_uid }}"
     group: "{{ etherpad_lite_app_gid }}"
diff --git a/roles/etherpad-lite/templates/pod-with-mariadb.yml.j2 b/roles/etherpad-lite/templates/pod-with-mariadb.yml.j2
index 0e0b6b8b..a4acdd21 100644
--- a/roles/etherpad-lite/templates/pod-with-mariadb.yml.j2
+++ b/roles/etherpad-lite/templates/pod-with-mariadb.yml.j2
@@ -7,7 +7,7 @@ spec:
     allowPrivilegeEscalation: false
   containers:
   - name: etherpad-lite
-    image: etherpad/etherpad:{{ item.value.version }}
+    image: spreadspace/etherpad-lite:{{ item.value.version }}
     # securityContext:
     #   runAsUser: {{ etherpad_lite_app_uid }}
     #   runAsGroup: {{ etherpad_lite_app_gid }}
@@ -16,13 +16,9 @@ spec:
         memory: "4Gi"
     volumeMounts:
     - name: config
-      mountPath: /opt/etherpad/settings.json
+      mountPath: /opt/etherpad-lite/settings.json
       subPath: settings.json
       readOnly: true
-    - name: config
-      mountPath: /opt/etherpad/credentials.json
-      subPath: credentials.json
-      readOnly: true
     ports:
     - containerPort: 9001
       hostPort: {{ item.value.port }}