You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by ru...@apache.org on 2017/06/23 01:26:49 UTC

[whimsy] branch master updated (17cf641 -> a091c57)

This is an automated email from the ASF dual-hosted git repository.

rubys pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


    from 17cf641  Hack to merge guinea pigs into normal output
     new f479fd4  mention setting up whimsysvn
     new a091c57  s/person/user/

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 DEPLOYMENT.md                         | 7 +++++--
 www/roster/views/actions/ppmc.json.rb | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].

[whimsy] 01/02: mention setting up whimsysvn

Posted by ru...@apache.org.
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

commit f479fd4d617ba75d9676ca919e2771cccae0d7bd
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Thu Jun 22 20:43:01 2017 -0400

    mention setting up whimsysvn
---
 DEPLOYMENT.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md
index 3d470bc..cd28360 100644
--- a/DEPLOYMENT.md
+++ b/DEPLOYMENT.md
@@ -82,6 +82,9 @@ and running - these are only needed for a new deployment.
  * 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 whimsy4.apache.org -d whimsy-vm4.apache.org -d whimsy-test.apache.org`
 
+ * Configure `/home/whimsysvn/.subversion/config` and
+   `/home/whimsysvn/.subversion/servers` to store auth-creds.
+
  * Configure `/var/www/.subversion/config` and
    `/var/www/.subversion/servers` to store auth-creds and to use the
    `whimsysvn` user.
@@ -105,8 +108,8 @@ and running - these are only needed for a new deployment.
       alias.
 
  * Using the `www-data` user, copy over the following directories from
-   the previous whimsy-vm* server: `/var/www/.subversion`, `/srv/agenda`,
-   `/srv/mail/board`, `/srv/mail/members`, `/srv/mail/secretary`.
+   the previous whimsy-vm* server: `/srv/agenda`, `/srv/mail/board`,
+   `/srv/mail/members`, `/srv/mail/secretary`.
  
  * Verify that email can be sent to non-apache.org email addresses
    * Run [testmail.rb](tools/testmail.rb)

-- 
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.

[whimsy] 02/02: s/person/user/

Posted by ru...@apache.org.
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

commit a091c57ed362d98e947a24ab03a34b9335bce76a
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Thu Jun 22 21:26:31 2017 -0400

    s/person/user/
---
 www/roster/views/actions/ppmc.json.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/roster/views/actions/ppmc.json.rb b/www/roster/views/actions/ppmc.json.rb
index 933f006..47870de 100644
--- a/www/roster/views/actions/ppmc.json.rb
+++ b/www/roster/views/actions/ppmc.json.rb
@@ -33,7 +33,7 @@ if env.password
         incubator = ASF::Project.find('incubator')
         icommit = incubator.members
         user = ASF::Person.find(env.user)
-        if user.asf_member? or incubator.owners.include? person
+        if user.asf_member? or incubator.owners.include? user
           if @action == 'add'
             additions = people - icommit
             incubator.add_committers(additions) unless additions.empty?

-- 
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.