opendev
/
system-config
Code Issues Proposed changes

Remove old etherpad.openstack.org 

Once the DNS is swapped over to point at etherpad.opendev.org
we can delete the old stuff.

Change-Id: I626dd22b22a23619fcf460533336f1ddfec615d9
This commit is contained in:
Monty Taylor 2020-04-04 11:08:12 -05:00
parent ca684c775b
commit 711295e918
8 changed files with 9 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/source/etherpad.rst
View File

@ -6,7 +6,7 @@ Etherpad
########
Etherpad (previously known as "etherpad-lite") is installed on
etherpad.openstack.org to facilitate real-time collaboration on
etherpad.opendev.org to facilitate real-time collaboration on
documents. It is used extensively during OpenStack Developer
Summits.
@ -15,10 +15,11 @@ At a Glance
:Hosts:
* http://etherpad.openstack.org
:Puppet:
* https://opendev.org/opendev/puppet-etherpad_lite/tree/
* :git_file:`modules/openstack_project/manifests/etherpad.pp`
* :git_file:`modules/openstack_project/manifests/etherpad_dev.pp`
:Ansible:
* https://opendev.org/opendev/system-config
* :git_file:`playbooks/roles/etherpad`
* :git_file:`playbooks/service-etherpad.yaml`
* :git_file:`playbooks/host_vars/etherpad01.opendev.org.yaml`
:Projects:
* http://etherpad.org/
* https://github.com/ether/etherpad-lite
@ -48,8 +49,9 @@ browser). This is fairly easily accomplished via the `HTTP API`_, but
you need the key which is saved in a file on the server so it's easiest
if done when SSH'd into it locally::
wget -qO- 'http://localhost:9001/api/1/deletePad?apikey='$(cat \
/opt/etherpad-lite/etherpad-lite/APIKEY.txt)'&padID=XXXXXXXXXX'
/usr/bin/docker-compose -f /etc/etherpad-docker/docker-compose.yaml exec -T etherpad \
bash -c "wget -qO- 'http://localhost:9001/api/1/deletePad?apikey='$(cat \
/opt/etherpad-lite/APIKEY.txt)'&padID=XXXXXXXXXX'"
...where XXXXXXXXXX is the pad's name as it appears at the end of its
URL. If all goes well, you should receive a response like::

2
hiera/common.yaml
View File

@ -238,8 +238,6 @@ cacti_hosts:
- elasticsearch06.openstack.org
- elasticsearch07.openstack.org
- ethercalc01.openstack.org
- etherpad-dev.openstack.org
- etherpad.openstack.org
- firehose01.openstack.org
- git.openstack.org
- git01.openstack.org

6
inventory/groups.yaml
View File

@ -46,7 +46,6 @@ groups:
elasticsearch: elasticsearch[0-9]*.open*.org
ethercalc: ethercalc*.open*.org
etherpad: etherpad[0-9]*.open*.org
etherpad-dev: etherpad-dev[0-9]*.open*.org
firehose: firehose[0-9]*.open*.org
gerrit:
- review-dev[0-9]*.open*.org
@ -125,8 +124,6 @@ groups:
- eavesdrop[0-9]*.open*.org
- elasticsearch[0-9]*.open*.org
- ethercalc[0-9]*.open*.org
- etherpad[0-9]*.openstack.org
- etherpad-dev[0-9]*.open*.org
- firehose[0-9]*.open*.org
- grafana[0-9]*.open*.org
- graphite*.open*.org
@ -169,8 +166,6 @@ groups:
- eavesdrop[0-9]*.open*.org
- elasticsearch[0-9]*.open*.org
- ethercalc[0-9]*.open*.org
- etherpad[0-9]*.openstack.org
- etherpad-dev[0-9]*.open*.org
- firehose[0-9]*.open*.org
- grafana[0-9]*.open*.org
- graphite[0-9]*.open*.org
@ -233,7 +228,6 @@ groups:
- codesearch[0-9]*.open*.org
- eavesdrop[0-9]*.open*.org
- ethercalc[0-9]*.open*.org
- etherpad-dev[0-9]*.open*.org
- etherpad[0-9]*.open*.org
- grafana[0-9]*.open*.org
- graphite*.open*.org

14
inventory/openstack.yaml
View File

@ -140,13 +140,6 @@ all:
region_name: DFW
public_v4: 162.242.144.125
public_v6: 2001:4800:7817:101:be76:4eff:fe04:5674
etherpad-dev01.openstack.org:
ansible_host: 2001:4800:7817:104:be76:4eff:fe04:66e1
location:
cloud: openstackci-rax
region_name: DFW
public_v4: 23.253.253.164
public_v6: 2001:4800:7817:104:be76:4eff:fe04:66e1
etherpad01.opendev.org:
ansible_host: 2001:4800:7818:104:be76:4eff:fe02:b0ff
location:
@ -154,13 +147,6 @@ all:
region_name: DFW
public_v4: 104.130.124.120
public_v6: 2001:4800:7818:104:be76:4eff:fe02:b0ff
etherpad01.openstack.org:
ansible_host: 2001:4800:7817:104:be76:4eff:fe04:8f0c
location:
cloud: openstackci-rax
region_name: DFW
public_v4: 23.253.238.66
public_v6: 2001:4800:7817:104:be76:4eff:fe04:8f0c
firehose01.openstack.org:
ansible_host: 2001:4800:7818:103:be76:4eff:fe04:40aa
location:

29
manifests/site.pp
View File

@ -163,35 +163,6 @@ node /^ethercalc\d+\.open.*\.org$/ {
}
}
# Node-OS: xenial
node /^etherpad\d*\.open.*\.org$/ {
$group = "etherpad"
class { 'openstack_project::server': }
class { 'openstack_project::etherpad':
vhost_name => 'etherpad.openstack.org',
ssl_cert_file_contents => hiera('etherpad_ssl_cert_file_contents'),
ssl_key_file_contents => hiera('etherpad_ssl_key_file_contents'),
ssl_chain_file_contents => hiera('etherpad_ssl_chain_file_contents'),
mysql_host => hiera('etherpad_db_host', 'localhost'),
mysql_user => hiera('etherpad_db_user', 'username'),
mysql_password => hiera('etherpad_db_password'),
}
}
# Node-OS: xenial
node /^etherpad-dev\d*\.open.*\.org$/ {
$group = "etherpad-dev"
class { 'openstack_project::server': }
class { 'openstack_project::etherpad_dev':
vhost_name => 'etherpad-dev.openstack.org',
mysql_host => hiera('etherpad-dev_db_host', 'localhost'),
mysql_user => hiera('etherpad-dev_db_user', 'username'),
mysql_password => hiera('etherpad-dev_db_password'),
}
}
# Node-OS: xenial
node /^wiki\d+\.openstack\.org$/ {
$group = "wiki"

1
modules.env
View File

@ -74,7 +74,6 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-drupal"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-elastic_recheck"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-elasticsearch"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-ethercalc"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-etherpad_lite"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-exim"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-germqtt"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-gerrit"]="origin/master"

57
modules/openstack_project/manifests/etherpad.pp
View File

@ -1,57 +0,0 @@
class openstack_project::etherpad (
$mysql_password,
$ssl_cert_file = '/etc/ssl/certs/etherpad.openstack.org.pem',
$ssl_key_file = '/etc/ssl/private/etherpad.openstack.org.key',
$ssl_chain_file = '/etc/ssl/certs/intermediate.pem',
$ssl_cert_file_contents = '',
$ssl_key_file_contents = '',
$ssl_chain_file_contents = '',
$mysql_host = 'localhost',
$mysql_user = 'eplite',
$mysql_db_name = 'etherpad-lite',
$vhost_name = $::fqdn,
) {
class { 'etherpad_lite':
ep_ensure => 'latest',
eplite_version => '1.7.0',
nodejs_version => '6.x',
}
class { 'etherpad_lite::apache':
vhost_name => $vhost_name,
ssl_cert_file => $ssl_cert_file,
ssl_key_file => $ssl_key_file,
ssl_chain_file => $ssl_chain_file,
ssl_cert_file_contents => $ssl_cert_file_contents,
ssl_key_file_contents => $ssl_key_file_contents,
ssl_chain_file_contents => $ssl_chain_file_contents,
}
class { 'etherpad_lite::site':
etherpad_title => 'OpenStack Etherpad',
database_host => $mysql_host,
database_user => $mysql_user,
database_name => $mysql_db_name,
database_password => $mysql_password,
}
etherpad_lite::plugin { 'ep_headings':
require => Class['etherpad_lite'],
}
mysql_backup::backup_remote { 'etherpad-lite':
database_host => $mysql_host,
database_user => $mysql_user,
database_password => $mysql_password,
num_backups => '5',
require => Class['etherpad_lite'],
}
include bup
bup::site { 'ord.rax':
backup_user => 'bup-etherpad',
backup_server => 'backup01.ord.rax.ci.openstack.org',
}
}
# vim:sw=2:ts=2:expandtab:textwidth=79

41
modules/openstack_project/manifests/etherpad_dev.pp
View File

@ -1,41 +0,0 @@
class openstack_project::etherpad_dev (
$mysql_password,
$mysql_host = 'localhost',
$mysql_user = 'eplite',
$mysql_db_name = 'etherpad-lite',
$vhost_name = $::fqdn,
) {
class { 'etherpad_lite':
ep_ensure => 'latest',
nodejs_version => '10.x',
}
class { 'etherpad_lite::apache':
vhost_name => $vhost_name,
ssl_cert_file => '/etc/ssl/certs/ssl-cert-snakeoil.pem',
ssl_key_file => '/etc/ssl/private/ssl-cert-snakeoil.key',
ssl_chain_file => '',
}
class { 'etherpad_lite::site':
etherpad_title => 'OpenStack Dev Etherpad',
database_host => $mysql_host,
database_user => $mysql_user,
database_name => $mysql_db_name,
database_password => $mysql_password,
}
etherpad_lite::plugin { 'ep_headings':
require => Class['etherpad_lite'],
}
mysql_backup::backup_remote { 'etherpad-lite-dev':
database_host => $mysql_host,
database_user => $mysql_user,
database_password => $mysql_password,
num_backups => '5',
require => Class['etherpad_lite'],
}
}
# vim:sw=2:ts=2:expandtab:textwidth=79