diff options
Diffstat (limited to '')
| -rw-r--r-- | roles/pad-proxy/templates/etherpad.nginx.conf | 4 | ||||
| -rw-r--r-- | roles/pad/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/pad/templates/settings.json | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/roles/pad-proxy/templates/etherpad.nginx.conf b/roles/pad-proxy/templates/etherpad.nginx.conf index 3131178..144185f 100644 --- a/roles/pad-proxy/templates/etherpad.nginx.conf +++ b/roles/pad-proxy/templates/etherpad.nginx.conf @@ -38,7 +38,7 @@ server { {% if use_wikimedia %} location ~ ^/$ { - return 302 https://etherpad.wikimedia.org/p/emacsconf-2022; + return 302 https://etherpad.wikimedia.org/p/emacsconf-{{ emacsconf_year }}; } location / { rewrite /(.*) https://etherpad.wikimedia.org/p/emacsconf-$1 redirect; @@ -49,7 +49,7 @@ server { proxy_pass http://etherpad_upstream; } location / { - rewrite ^/?$ https://pad.emacsconf.org/2022 redirect; + rewrite ^/?$ https://pad.emacsconf.org/{{ emacsconf_year }} redirect; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/roles/pad/defaults/main.yml b/roles/pad/defaults/main.yml index 2d54195..6de2403 100644 --- a/roles/pad/defaults/main.yml +++ b/roles/pad/defaults/main.yml @@ -6,5 +6,5 @@ etherpad_database_user: etherpad etherpad_user: etherpad etherpad_group: etherpad etherpad_base: emacsconf -etherpad_year: 2022 +etherpad_year: {{ emacsconf_year }} etherpad_load_test: false diff --git a/roles/pad/templates/settings.json b/roles/pad/templates/settings.json index f81d232..dbbbda1 100644 --- a/roles/pad/templates/settings.json +++ b/roles/pad/templates/settings.json @@ -217,7 +217,7 @@ /* * The default text of a pad */ - "defaultPadText" : "Conference info, how to watch/participate: https://emacsconf.org/2022/\nGuidelines for conduct: https://emacsconf.org/conduct/\nSee end of file for license (CC Attribution-ShareAlike 4.0 + GPLv3 or later)\n----------------------------------------------------------------\nQuestions and discussion go here:\n- \n- \n- \n- \n- \n- \n- \n\n----------------------------------------------------------------\nExcept where otherwise noted, the material on the EmacsConf pad are dual-licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International Public License; and the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) an later version. Copies of these two licenses are included in the EmacsConf wiki repository, in the COPYING.GPL and COPYING.CC-BY-SA files (https://emacsconf.org/COPYING/)\n\nBy contributing to this pad, you agree to make your contributions available under the above licenses. You are also promising that you are the author of your changes, or that you copied them from a work in the public domain or a work released under a free license that is compatible with the above two licenses. DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION.", + "defaultPadText" : "Conference info, how to watch/participate: https://emacsconf.org/{{ emacsconf_year }}/\nGuidelines for conduct: https://emacsconf.org/conduct/\nSee end of file for license (CC Attribution-ShareAlike 4.0 + GPLv3 or later)\n----------------------------------------------------------------\nQuestions and discussion go here:\n- \n- \n- \n- \n- \n- \n- \n\n----------------------------------------------------------------\nExcept where otherwise noted, the material on the EmacsConf pad are dual-licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International Public License; and the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) an later version. Copies of these two licenses are included in the EmacsConf wiki repository, in the COPYING.GPL and COPYING.CC-BY-SA files (https://emacsconf.org/COPYING/)\n\nBy contributing to this pad, you agree to make your contributions available under the above licenses. You are also promising that you are the author of your changes, or that you copied them from a work in the public domain or a work released under a free license that is compatible with the above two licenses. DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION.", /* * Default Pad behavior. |