opendev/system-config
Code Issues Proposed changes

Merge "Upgrade Etherpad to 1.8.4"

Browse Source
This commit is contained in:
Zuul 2020-07-02 19:50:32 +00:00 committed by Gerrit Code Review
commit 90d1a15ea0
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/etherpad/Dockerfile
View File

@ -13,8 +13,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM docker.io/etherpad/etherpad:1.8.0
FROM docker.io/etherpad/etherpad:1.8.4
LABEL maintainer="infra-root@openstack.org"
RUN cd /opt/etherpad-lite && npm install ep_headings
# Install the headings plugin and fix css on 1.8.4.
# Newer etherpad shouldn't need the css fix.
RUN cd /opt/etherpad-lite && npm install ep_headings \
&& sed -i -e 's/padding: 6px 0 !important;/padding: 0 0 !important;/' \
/opt/etherpad-lite/src/static/css/iframe_editor.css

4
playbooks/roles/etherpad/templates/settings.json.j2
View File

@ -29,6 +29,10 @@
"charset" : "utf8mb4",
"database": "etherpad-lite"
},
//force no skin as default has changed to colibris
"skinName": "no-skin",
//the default text of a pad
"defaultPadText" : "Welcome to OpenDev Etherpad!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nOpenDev: https://opendev.org\nEtherpad on Github: https://github.com/ether/etherpad-lite\n",