This is an automated email from the ASF dual-hosted git repository.
rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 8716291 cleanup DEPLOYMENT instructions for whimsy-vm4
8716291 is described below
commit 871629149731cec0866ac236f8d12aeee962cf2d
Author: Sam Ruby <[email protected]>
AuthorDate: Mon May 8 16:28:39 2017 -0400
cleanup DEPLOYMENT instructions for whimsy-vm4
---
DEPLOYMENT.md | 28 ++++++++--------------------
1 file changed, 8 insertions(+), 20 deletions(-)
diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md
index 4008010..08d264e 100644
--- a/DEPLOYMENT.md
+++ b/DEPLOYMENT.md
@@ -17,14 +17,14 @@ Application developers may need to know where different
things are configured:
Production Configuration
==========
-The Whimsy VM runs Ubuntu 14.04 and is fully managed by Puppet using
+The Whimsy VM runs Ubuntu 16.04 and is fully managed by Puppet using
the normal methods Apache infra uses for managing servers. Note however
that management of Whimsy is a PMC responsibility.
<a name="puppetnode"></a>
The **puppet definition** is contained in the following files:
- *
https://github.com/apache/infrastructure-puppet/blob/deployment/data/nodes/whimsy-vm3.apache.org.yaml
(Includes modules, software, vhosts, ldap realms, and httpd.conf)
+ *
https://github.com/apache/infrastructure-puppet/blob/deployment/data/nodes/whimsy-vm4.apache.org.yaml
(Includes modules, software, vhosts, ldap realms, and httpd.conf)
*
https://github.com/apache/infrastructure-puppet/blob/deployment/modules/whimsy_server/manifests/init.pp
(Defines various tools and directories used in some tools)
@@ -53,7 +53,7 @@ Manual Steps
The following additional steps are required to get the Whimsy VM up and
running:
* Run the following command to create an SSL cert (see
[tutorial](https://www.digitalocean.com/community/tutorials/how-to-secure-apache-with-let-s-encrypt-on-ubuntu-14-04)
for details):
- * `/x1/srv/git/letsencrypt/letsencrypt-auto --apache -d whimsy.apache.org
-d whimsy3.apache.org -d whimsy-vm3.apache.org -d whimsy-test.apache.org`
+ * `/x1/srv/git/letsencrypt/letsencrypt-auto --apache -d whimsy.apache.org
-d whimsy4.apache.org -d whimsy-vm4.apache.org -d whimsy-test.apache.org`
* Configure `/var/www/.subversion/config` and
`/var/www/.subversion/servers` to store auth-creds and to use the
@@ -67,13 +67,13 @@ The following additional steps are required to get the
Whimsy VM up and running:
* `46 * * * * ezmlm-list /home/apmail/lists/apache.org/members/ . | ssh
whimsy-vm4.apache.org 'cat > /srv/subscriptions/members'`
* Add the following mail subscriptions:
- * Subscribe `[email protected]` to `[email protected]`.
+ * Subscribe `[email protected]` to `[email protected]`.
Alternately, add it to the `board-cvs` alias.
- * Subscribe `[email protected]` to
+ * Subscribe `[email protected]` to
`[email protected]`.
- * Subscribe `[email protected]` to `[email protected]`.
- * Subscribe `[email protected]` to `[email protected]`.
- * Add `[email protected]` to the `[email protected]`
+ * Subscribe `[email protected]` to `[email protected]`.
+ * Subscribe `[email protected]` to `[email protected]`.
+ * Add `[email protected]` to the `[email protected]`
alias.
* Using the `www-data` user, copy over the following directories from
@@ -82,15 +82,3 @@ The following additional steps are required to get the
Whimsy VM up and running:
* Verify that email can be sent to non-apache.org email addresses
* Run [testmail.rb](tools/testmail.rb)
-
-The following additional steps are required for now, but will hopefully go
-away once the transition away from the secretary workbench is complete:
-
- * Using the `www-data` user, check out the following repositories:
- * `svn co https://svn.apache.org/repos/private/foundation
/srv/secretary/workbench/foundation`
- * `svn co https://svn.apache.org/repos/private/documents
/srv/secretary/workbench/documents`
- * `svn co https://svn.apache.org/repos/infra/infrastructure/trunk/subreq
/srv/secretary/workbench/subreq`
- * `svn co
https://svn.apache.org/repos/infra/infrastructure/trunk/tlpreq/input
/srv/secretary/tlpreq`
-
- * Copy `www/secretary/workbench/secmail.rb` to
- `/srv/secretary/workbench/secmail.rb`
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
