You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2014/03/27 18:01:27 UTC

[1/4] git commit: [#7287] add a few pointers and text tweaks; move ssh/ldap auth to its own page

Repository: allura
Updated Branches:
  refs/heads/cj/7277 efde5c9fe -> f9c813dc0 (forced update)


[#7287] add a few pointers and text tweaks; move ssh/ldap auth to its own page


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/829f9675
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/829f9675
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/829f9675

Branch: refs/heads/cj/7277
Commit: 829f9675c8c97931a335fdae7419f72c25b4ecbf
Parents: f396835
Author: Dave Brondsema <da...@brondsema.net>
Authored: Wed Mar 26 15:50:28 2014 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Mar 26 15:51:11 2014 -0400

----------------------------------------------------------------------
 Allura/docs/scm_host.rst     | 200 +++-----------------------------------
 Allura/docs/scm_host_ssh.rst | 197 +++++++++++++++++++++++++++++++++++++
 2 files changed, 211 insertions(+), 186 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/829f9675/Allura/docs/scm_host.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/scm_host.rst b/Allura/docs/scm_host.rst
index 82bb6a7..3a80490 100644
--- a/Allura/docs/scm_host.rst
+++ b/Allura/docs/scm_host.rst
@@ -70,7 +70,7 @@ If there is no output, that is fine (it's an empty repo).
 
 .. warning::
 
-    This configuration has no authentication and is suitable for development only.
+    This configuration has no authentication and is suitable for development only.  See :ref:`below <auth_apache>` for auth config.
 
 Now you will want to change the :samp:`scm.host.{*}.git`
 settings in :file:`development.ini`, so that the proper commands are shown to your visitors
@@ -110,6 +110,7 @@ run :command:`killall svnserve`  More info at http://svnbook.red-bean.com/en/1.8
 .. warning::
 
     This configuration has no authentication and is suitable for development only.
+    (Maybe Allura could gain SASL support someday and use `svnserve with SASL <http://svnbook.red-bean.com/en/1.7/svn.serverconfig.svnserve.html#svn.serverconfig.svnserve.sasl>`_)
 
 Now you will want to change the :samp:`scm.host.{*}.svn`
 settings in :file:`development.ini`, so that the proper commands are shown to your visitors
@@ -166,15 +167,16 @@ Then Apache SVN will serve repositories for all Allura projects and subprojects.
 
 .. warning::
 
-    This configuration has no authentication and is suitable for development only.
+    This configuration has no authentication and is suitable for development only.  See :ref:`the next section <auth_apache>` for auth config.
 
 
+.. _auth_apache:
 
-Configuring Git/SVN/Hg to use Allura auth via mod_python and ApacheAccessHandler.py
-===================================================================================
+Configuring Auth with Apache
+-----------------------------------------------
 
-This is the easiest way to integrate authentication for SCM access with Allura.  It uses
-mod_python and the handler in `scripts/ApacheAccessHandler.py` to query Allura directly
+This is the easiest way to integrate authentication and authorization for SCM access with Allura.  It uses
+mod_python and the handler in :file:`scripts/ApacheAccessHandler.py` to query Allura directly
 for auth and permissions before allowing access to the SCM.  Of course, this only works
 for SCM access over HTTP(S).
 
@@ -191,11 +193,11 @@ access handler, e.g.:
 
     <LocationMatch "^/(git|svn|hg)/">
         AddHandler mod_python .py
-        PythonAccessHandler /var/local/allura/scripts/ApacheAccessHandler.py
+        PythonAccessHandler /PATH/TO/allura/scripts/ApacheAccessHandler.py
         AuthType Basic
         AuthName "SCM Access"
         AuthBasicAuthoritative off
-        PythonOption ALLURA_VIRTUALENV /var/local/env-allura
+        PythonOption ALLURA_VIRTUALENV /PATH/TO/env-allura
         PythonOption ALLURA_AUTH_URL https://127.0.0.1/auth/do_login
         PythonOption ALLURA_PERM_URL https://127.0.0.1/auth/repo_permissions
     </LocationMatch>
@@ -208,184 +210,10 @@ and password will be otherwise be sent in the clear to Allura.
 
     Currently, for Mercurial, the handler doesn't correctly distinguish read
     and write requests and thus requires WRITE permission for every request.
+    See ticket #7288
 
 
+Advanced Alternative
+-----------------------------------------------
 
-Configuring Git/SVN/Hg to use Allura auth via LDAP and ssh
-============================================================
-
-The following instructions will use a chroot, a custom FUSE driver, and LDAP.
-Once completed, an ssh-based configuration of Git, SVN, or Hg that has repos in
-the chroot directory will authenticate the users against LDAP and authorize via an Allura API.
-Allura will be configured to authenticate against LDAP as well.
-
-.. note::
-
-    The previous git & svn configuration instructions are not ssh-based, so will not work with this configuration.
-    You'll have to reconfigure git & svn to use ssh:// instead of http or svn protocols.
-
-We assume you are using a version of Ubuntu with
-support for schroot and debootstrap.  We will use a chroot jail to allow users to
-access their repositories via ssh.
-
-Install a chroot environment
--------------------------------------------
-
-These instructions are based on the documentation in `Debootstrap Chroot`_.  and `OpenLDAPServer`_.
-
-Install debootstrap and schroot: :program:`aptitude install debootstrap schroot`
-
-Append the following text to the file :file:`/etc/schroot/schroot.conf`
-
-.. code-block:: ini
-
-    [scm]
-    description=Ubuntu Chroot for SCM Hosting
-    type=directory
-    directory=/var/chroots/scm
-    script-config=scm/config
-
-Create a directory :file:`/etc/schroot/scm` and populate it with some files:
-
-.. code-block:: console
-
-    # mkdir /etc/schroot/scm
-    # cat > /etc/schroot/scm/config <<EOF
-    FSTAB="/etc/schroot/scm/fstab"
-    COPYFILES="/etc/schroot/scm/copyfiles"
-    NSSDATABASES="/etc/schroot/scm/nssdatabases"
-    EOF
-    # cat > /etc/schroot/scm/fstab <<EOF
-    /proc		/proc		none    rw,rbind        0       0
-    /sys		/sys		none    rw,rbind        0       0
-    /dev            /dev            none    rw,rbind        0       0
-    /tmp		/tmp		none	rw,bind		0	0
-    EOF
-    # cat > /etc/schroot/scm/copyfiles <<EOF
-    /etc/resolv.conf
-    EOF
-    # cat > /etc/schroot/scm/nssdatabases <<EOF
-    services
-    protocols
-    networks
-    hosts
-    EOF
-
-Create a directory :file:`/var/chroots/scm` and create the bootstrap environment.  (You may substitute a mirror from the  `ubuntu mirror list`_ for archive.ubuntu.com)
-
-.. code-block:: console
-
-    $ sudo mkdir -p /var/chroots/scm
-    $ sudo debootstrap --variant=buildd --arch amd64 --components=main,universe --include=git,mercurial,subversion,openssh-server,slapd,ldap-utils,ldap-auth-client,curl maverick /var/chroots/scm http://archive.ubuntu.com/ubuntu/
-
-Test that the chroot is installed by entering it:
-
-.. code-block:: console
-
-    # schroot -c scm -u root
-    (scm) # logout
-
-Configure OpenLDAP in the Chroot
---------------------------------------------------------------
-
-Copy the ldap-setup script into the chroot environment:
-
-.. code-block:: console
-
-    $ sudo cp Allura/ldap-setup.py Allura/ldap-userconfig.py /var/chroots/scm
-    $ sudo chmod +x /var/chroots/scm/ldap-*.py
-
-Log in to the chroot environment:
-
-.. code-block:: console
-
-    # schroot -c scm -u root
-
-Run the setup script, following the prompts:
-
-.. code-block:: console
-
-    (scm) # python /ldap-setup.py
-
-In particular, you will need to answer the following questions (substitute your custom suffix if you are not using dc=localdomain):
-
-* Should debconf manage LDAP configuration? **yes**
-* LDAP server Uniform Resource Identifier: **ldapi:///**
-* Distinguished name of the search base: **dc=localdomain**
-* LDAP version to use: **1** (version 3)
-* Make local root Database admin: **yes**
-* Does the LDAP database require login? **no**
-* LDAP account for root: **cn=admin,dc=localdomain**
-* LDAP root account password: *empty*
-* Local crypt to use when changing passwords: **2** (crypt)
-* PAM profiles to enable: **2**
-
-Update the chroot ssh configuration
--------------------------------------------------
-
-Update the file :file:`/var/chroot/scm/etc/ssh/sshd_config`, changing the port directive:
-
-.. code-block:: guess
-
-    # Port 22
-    Port 8022
-
-Setup the Custom FUSE Driver
--------------------------------------
-
-Copy the accessfs script into the chroot environment:
-
-.. code-block:: console
-
-    $ sudo cp fuse/accessfs.py /var/chroots/scm
-
-Configure allura to point to the chrooted scm environment:
-
-.. code-block:: console
-
-    $ sudo ln -s /var/chroots/scm /srv/git
-    $ sudo ln -s /var/chroots/scm /srv/hg
-    $ sudo ln -s /var/chroots/scm /srv/svn
-
-Log in to the chroot environment & install packages:
-
-.. code-block:: console
-
-    # schroot -c scm -u root
-    (scm) # apt-get install python-fuse
-
-Create the SCM directories:
-
-.. code-block:: console
-
-    (scm) # mkdir /scm /scm-repo
-
-Mount the FUSE filesystem:
-
-.. code-block:: console
-
-    (scm) # python /accessfs.py /scm-repo -o allow_other -s -o root=/scm
-
-Start the SSH daemon:
-
-.. code-block:: console
-
-    (scm) # /etc/init.d/ssh start
-
-Configure Allura to Use the LDAP Server
-------------------------------------------------
-
-Set the following values in your .ini file:
-
-.. code-block:: ini
-
-    auth.method = ldap
-
-    auth.ldap.server = ldap://localhost
-    auth.ldap.suffix = ou=people,dc=localdomain
-    auth.ldap.admin_dn = cn=admin,dc=localdomain
-    auth.ldap.admin_password = secret
-
-.. _Debootstrap Chroot: https://help.ubuntu.com/community/DebootstrapChroot
-.. _OpenLDAPServer: https://help.ubuntu.com/10.10/serverguide/C/openldap-server.html
-.. _ubuntu mirror list: https://launchpad.net/ubuntu/+archivemirrors
+An advanced alternative for SCM hosting using :ref:`SSH, LDAP, and a FUSE driver <scm_hosting_ssh>` is available.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/allura/blob/829f9675/Allura/docs/scm_host_ssh.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/scm_host_ssh.rst b/Allura/docs/scm_host_ssh.rst
new file mode 100644
index 0000000..fee11f6
--- /dev/null
+++ b/Allura/docs/scm_host_ssh.rst
@@ -0,0 +1,197 @@
+..     Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+
+.. _scm_hosting_ssh:
+
+Configuring Git/SVN/Hg to use Allura auth via LDAP and ssh
+============================================================
+
+The following instructions will use a chroot, a custom FUSE driver, and LDAP.
+Once completed, an ssh-based configuration of Git, SVN, or Hg that has repos in
+the chroot directory will authenticate the users against LDAP and authorize via an Allura API.
+Allura will be configured to authenticate against LDAP as well.
+
+.. note::
+
+    The previous git & svn configuration instructions are not ssh-based, so will not work with this configuration.
+    You'll have to reconfigure git & svn to use ssh:// instead of http or svn protocols.
+
+We assume you are using a version of Ubuntu with
+support for schroot and debootstrap.  We will use a chroot jail to allow users to
+access their repositories via ssh.
+
+Install a chroot environment
+-------------------------------------------
+
+These instructions are based on the documentation in `Debootstrap Chroot`_.  and `OpenLDAPServer`_.
+
+Install debootstrap and schroot: :program:`aptitude install debootstrap schroot`
+
+Append the following text to the file :file:`/etc/schroot/schroot.conf`
+
+.. code-block:: ini
+
+    [scm]
+    description=Ubuntu Chroot for SCM Hosting
+    type=directory
+    directory=/var/chroots/scm
+    script-config=scm/config
+
+Create a directory :file:`/etc/schroot/scm` and populate it with some files:
+
+.. code-block:: console
+
+    # mkdir /etc/schroot/scm
+    # cat > /etc/schroot/scm/config <<EOF
+    FSTAB="/etc/schroot/scm/fstab"
+    COPYFILES="/etc/schroot/scm/copyfiles"
+    NSSDATABASES="/etc/schroot/scm/nssdatabases"
+    EOF
+    # cat > /etc/schroot/scm/fstab <<EOF
+    /proc		/proc		none    rw,rbind        0       0
+    /sys		/sys		none    rw,rbind        0       0
+    /dev            /dev            none    rw,rbind        0       0
+    /tmp		/tmp		none	rw,bind		0	0
+    EOF
+    # cat > /etc/schroot/scm/copyfiles <<EOF
+    /etc/resolv.conf
+    EOF
+    # cat > /etc/schroot/scm/nssdatabases <<EOF
+    services
+    protocols
+    networks
+    hosts
+    EOF
+
+Create a directory :file:`/var/chroots/scm` and create the bootstrap environment.  (You may substitute a mirror from the  `ubuntu mirror list`_ for archive.ubuntu.com)
+
+.. code-block:: console
+
+    $ sudo mkdir -p /var/chroots/scm
+    $ sudo debootstrap --variant=buildd --arch amd64 --components=main,universe --include=git,mercurial,subversion,openssh-server,slapd,ldap-utils,ldap-auth-client,curl maverick /var/chroots/scm http://archive.ubuntu.com/ubuntu/
+
+Test that the chroot is installed by entering it:
+
+.. code-block:: console
+
+    # schroot -c scm -u root
+    (scm) # logout
+
+Configure OpenLDAP in the Chroot
+--------------------------------------------------------------
+
+Copy the ldap-setup script into the chroot environment:
+
+.. code-block:: console
+
+    $ sudo cp Allura/ldap-setup.py Allura/ldap-userconfig.py /var/chroots/scm
+    $ sudo chmod +x /var/chroots/scm/ldap-*.py
+
+Log in to the chroot environment:
+
+.. code-block:: console
+
+    # schroot -c scm -u root
+
+Run the setup script, following the prompts:
+
+.. code-block:: console
+
+    (scm) # python /ldap-setup.py
+
+In particular, you will need to answer the following questions (substitute your custom suffix if you are not using dc=localdomain):
+
+* Should debconf manage LDAP configuration? **yes**
+* LDAP server Uniform Resource Identifier: **ldapi:///**
+* Distinguished name of the search base: **dc=localdomain**
+* LDAP version to use: **1** (version 3)
+* Make local root Database admin: **yes**
+* Does the LDAP database require login? **no**
+* LDAP account for root: **cn=admin,dc=localdomain**
+* LDAP root account password: *empty*
+* Local crypt to use when changing passwords: **2** (crypt)
+* PAM profiles to enable: **2**
+
+Update the chroot ssh configuration
+-------------------------------------------------
+
+Update the file :file:`/var/chroot/scm/etc/ssh/sshd_config`, changing the port directive:
+
+.. code-block:: guess
+
+    # Port 22
+    Port 8022
+
+Setup the Custom FUSE Driver
+-------------------------------------
+
+Copy the accessfs script into the chroot environment:
+
+.. code-block:: console
+
+    $ sudo cp fuse/accessfs.py /var/chroots/scm
+
+Configure allura to point to the chrooted scm environment:
+
+.. code-block:: console
+
+    $ sudo ln -s /var/chroots/scm /srv/git
+    $ sudo ln -s /var/chroots/scm /srv/hg
+    $ sudo ln -s /var/chroots/scm /srv/svn
+
+Log in to the chroot environment & install packages:
+
+.. code-block:: console
+
+    # schroot -c scm -u root
+    (scm) # apt-get install python-fuse
+
+Create the SCM directories:
+
+.. code-block:: console
+
+    (scm) # mkdir /scm /scm-repo
+
+Mount the FUSE filesystem:
+
+.. code-block:: console
+
+    (scm) # python /accessfs.py /scm-repo -o allow_other -s -o root=/scm
+
+Start the SSH daemon:
+
+.. code-block:: console
+
+    (scm) # /etc/init.d/ssh start
+
+Configure Allura to Use the LDAP Server
+------------------------------------------------
+
+Set the following values in your .ini file:
+
+.. code-block:: ini
+
+    auth.method = ldap
+
+    auth.ldap.server = ldap://localhost
+    auth.ldap.suffix = ou=people,dc=localdomain
+    auth.ldap.admin_dn = cn=admin,dc=localdomain
+    auth.ldap.admin_password = secret
+
+.. _Debootstrap Chroot: https://help.ubuntu.com/community/DebootstrapChroot
+.. _OpenLDAPServer: https://help.ubuntu.com/10.10/serverguide/C/openldap-server.html
+.. _ubuntu mirror list: https://launchpad.net/ubuntu/+archivemirrors


[2/4] git commit: [#7287] Added docs for using ApacheAccessHandler.py for SCM auth

Posted by jo...@apache.org.
[#7287] Added docs for using ApacheAccessHandler.py for SCM auth

Signed-off-by: Cory Johns <cj...@slashdotmedia.com>


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/f3968357
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/f3968357
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/f3968357

Branch: refs/heads/cj/7277
Commit: f39683572e903f152d0bac28a42d4a34fa9f3699
Parents: 8e88e3a
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Tue Mar 25 17:14:53 2014 +0000
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Mar 26 15:51:11 2014 -0400

----------------------------------------------------------------------
 Allura/docs/scm_host.rst | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/f3968357/Allura/docs/scm_host.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/scm_host.rst b/Allura/docs/scm_host.rst
index 0e11e8a..82bb6a7 100644
--- a/Allura/docs/scm_host.rst
+++ b/Allura/docs/scm_host.rst
@@ -170,6 +170,47 @@ Then Apache SVN will serve repositories for all Allura projects and subprojects.
 
 
 
+Configuring Git/SVN/Hg to use Allura auth via mod_python and ApacheAccessHandler.py
+===================================================================================
+
+This is the easiest way to integrate authentication for SCM access with Allura.  It uses
+mod_python and the handler in `scripts/ApacheAccessHandler.py` to query Allura directly
+for auth and permissions before allowing access to the SCM.  Of course, this only works
+for SCM access over HTTP(S).
+
+First, you need to ensure that mod_python is installed:
+
+.. code-block:: console
+
+    sudo aptitude install libapache2-mod-python
+
+Then, in the VirtualHost section where you proxy SCM requests to git, SVN, or Hg, add the
+access handler, e.g.:
+
+.. code-block:: apache
+
+    <LocationMatch "^/(git|svn|hg)/">
+        AddHandler mod_python .py
+        PythonAccessHandler /var/local/allura/scripts/ApacheAccessHandler.py
+        AuthType Basic
+        AuthName "SCM Access"
+        AuthBasicAuthoritative off
+        PythonOption ALLURA_VIRTUALENV /var/local/env-allura
+        PythonOption ALLURA_AUTH_URL https://127.0.0.1/auth/do_login
+        PythonOption ALLURA_PERM_URL https://127.0.0.1/auth/repo_permissions
+    </LocationMatch>
+
+If the SCM is hosted seperately from Allura, update the URLs as appropriate.
+Even if using localhost, it is recommended to use HTTPS, since the username
+and password will be otherwise be sent in the clear to Allura.
+
+.. warning::
+
+    Currently, for Mercurial, the handler doesn't correctly distinguish read
+    and write requests and thus requires WRITE permission for every request.
+
+
+
 Configuring Git/SVN/Hg to use Allura auth via LDAP and ssh
 ============================================================
 


[4/4] git commit: [#7277] Removed more "incubating" references and changed Allura homepage URL

Posted by jo...@apache.org.
[#7277] Removed more "incubating" references and changed Allura homepage URL

Signed-off-by: Cory Johns <cj...@slashdotmedia.com>


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/f9c813dc
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/f9c813dc
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/f9c813dc

Branch: refs/heads/cj/7277
Commit: f9c813dc085a371f7514156dd87e4b52d4ffc423
Parents: cb78d45
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Thu Mar 27 17:01:04 2014 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Thu Mar 27 17:01:04 2014 +0000

----------------------------------------------------------------------
 Allura/NOTICE                                          | 2 +-
 Allura/allura/templates/jinja_master/theme_macros.html | 2 +-
 Allura/docs/_templates/layout.html                     | 4 ++--
 Allura/docs/contributing.rst                           | 2 +-
 Allura/docs/online.rst                                 | 2 +-
 Allura/setup.py                                        | 2 +-
 CONTRIBUTING                                           | 6 +++---
 DISCLAIMER                                             | 8 --------
 ForgeDiscussion/NOTICE                                 | 2 +-
 ForgeGit/NOTICE                                        | 2 +-
 ForgeImporters/forgeimporters/base.py                  | 2 +-
 ForgeImporters/forgeimporters/tests/test_base.py       | 2 +-
 ForgeLink/NOTICE                                       | 2 +-
 ForgeSVN/NOTICE                                        | 2 +-
 ForgeTracker/NOTICE                                    | 2 +-
 ForgeWiki/NOTICE                                       | 2 +-
 INSTALL.markdown                                       | 4 ++--
 NOTICE                                                 | 2 +-
 NoWarnings/NOTICE                                      | 2 +-
 README.markdown                                        | 8 ++++----
 scripts/asf-release.sh                                 | 6 +++---
 vagrant/manifests/ubuntu-1204-server-amd64.pp          | 2 +-
 22 files changed, 30 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/f9c813dc/Allura/NOTICE
----------------------------------------------------------------------
diff --git a/Allura/NOTICE b/Allura/NOTICE
index 3938e2b..69af9fe 100644
--- a/Allura/NOTICE
+++ b/Allura/NOTICE
@@ -1,4 +1,4 @@
-Apache Allura (incubating)
+Apache Allura
 Copyright 2012-2014 The Apache Software Foundation
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/allura/blob/f9c813dc/Allura/allura/templates/jinja_master/theme_macros.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/theme_macros.html b/Allura/allura/templates/jinja_master/theme_macros.html
index 17702dd..6033fe8 100644
--- a/Allura/allura/templates/jinja_master/theme_macros.html
+++ b/Allura/allura/templates/jinja_master/theme_macros.html
@@ -36,7 +36,7 @@
 {%- macro footer(year, path_to_static='') %}
 <footer id="site-footer">
   <nav>
-      <p>This project is powered by <a href="https://forge-allura.apache.org/p/allura/">Apache Allura</a>.</p>
+      <p>This project is powered by <a href="https://allura.apache.org/">Apache Allura</a>.</p>
       <p>
       Copyright &copy; 2014 The Apache Software Foundation, Licensed under the
       <a style="color: #069;" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>

http://git-wip-us.apache.org/repos/asf/allura/blob/f9c813dc/Allura/docs/_templates/layout.html
----------------------------------------------------------------------
diff --git a/Allura/docs/_templates/layout.html b/Allura/docs/_templates/layout.html
index 5079c7d..42f079b 100644
--- a/Allura/docs/_templates/layout.html
+++ b/Allura/docs/_templates/layout.html
@@ -18,6 +18,6 @@
 -#}
 {% extends "!layout.html" %}
 {% block rootrellink %}
-    <li><a href="https://forge-allura.apache.org/p/allura/">Allura Home</a> &raquo;</li>
+    <li><a href="https://allura.apache.org/">Allura Home</a> &raquo;</li>
     {{ super() }}
-{% endblock %}
\ No newline at end of file
+{% endblock %}

http://git-wip-us.apache.org/repos/asf/allura/blob/f9c813dc/Allura/docs/contributing.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/contributing.rst b/Allura/docs/contributing.rst
index ac956eb..5dd83df 100644
--- a/Allura/docs/contributing.rst
+++ b/Allura/docs/contributing.rst
@@ -25,7 +25,7 @@ Getting Help
 ------------
 Along the way, you will no doubt have questions that aren't addressed here.
 For help, you can get in touch with other Allura developers on the developer
-mailing list (allura-dev@incubator.apache.org) or in the #allura channel on
+mailing list (dev@allura.apache.org) or in the #allura channel on
 the Freenode IRC network.
 
 Installing Allura

http://git-wip-us.apache.org/repos/asf/allura/blob/f9c813dc/Allura/docs/online.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/online.rst b/Allura/docs/online.rst
index 632d1c9..8f6518b 100644
--- a/Allura/docs/online.rst
+++ b/Allura/docs/online.rst
@@ -24,7 +24,7 @@ Generated API docs, useful for browsing through the code, viewing inheritance, e
 
 Our project page, including tickets, discussion forums, etc.:
 
-* https://forge-allura.apache.org/p/allura/
+* https://allura.apache.org/
 
 
 Much of the current forge was inspired by Roundup

http://git-wip-us.apache.org/repos/asf/allura/blob/f9c813dc/Allura/setup.py
----------------------------------------------------------------------
diff --git a/Allura/setup.py b/Allura/setup.py
index f3a1a20..1671283 100644
--- a/Allura/setup.py
+++ b/Allura/setup.py
@@ -37,7 +37,7 @@ setup(
     description='Base distribution of the Allura development platform',
     long_description=PROJECT_DESCRIPTION,
     author='Allura Team',
-    url='https://forge-allura.apache.org/p/allura/',
+    url='https://allura.apache.org/',
     keywords='allura forge turbogears pylons jinja2 mongodb',
     license='Apache License, http://www.apache.org/licenses/LICENSE-2.0',
     platforms=[

http://git-wip-us.apache.org/repos/asf/allura/blob/f9c813dc/CONTRIBUTING
----------------------------------------------------------------------
diff --git a/CONTRIBUTING b/CONTRIBUTING
index e52c1f1..0c70739 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -25,7 +25,7 @@ number of individual projects.
 SourceForge.net is running an instance of Allura (aka New Forge, or
 Forge 2.0); and Allura itself is a project managed there:
 
-  <https://forge-allura.apache.org/p/allura/>
+  <https://allura.apache.org/>
 
 The source for Allura is available there from a Git repo under the
 Apache License, Version 2.0.
@@ -81,7 +81,7 @@ possible or applicable:
 
 The code is self-hosted in a public git repository.  Get it by cloning:
 
-  git clone https://git-wip-us.apache.org/repos/asf/incubator-allura.git allura
+  git clone https://git-wip-us.apache.org/repos/asf/allura.git allura
 
 - CONTRIBUTING CODE
 
@@ -125,7 +125,7 @@ discussion where we talk about new features, submitted patches, bugs,
 direction, and deployment.  You can join in the discussion on the
 mailing list:
 
-  <http://mail-archives.apache.org/mod_mbox/incubator-allura-dev/>
+  <http://mail-archives.apache.org/mod_mbox/allura-dev/>
 
 
 - ASKING QUESTIONS

http://git-wip-us.apache.org/repos/asf/allura/blob/f9c813dc/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index 95a84f1..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache Allura is an effort undergoing incubation at The Apache
-Software Foundation (ASF), sponsored by the Apache Incubator PMC.
-Incubation is required of all newly accepted projects until a further
-review indicates that the infrastructure, communications, and decision
-making process have stabilized in a manner consistent with other
-successful ASF projects. While incubation status is not necessarily a
-reflection of the completeness or stability of the code, it does
-indicate that the project has yet to be fully endorsed by the ASF.

http://git-wip-us.apache.org/repos/asf/allura/blob/f9c813dc/ForgeDiscussion/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/NOTICE b/ForgeDiscussion/NOTICE
index 3938e2b..69af9fe 100644
--- a/ForgeDiscussion/NOTICE
+++ b/ForgeDiscussion/NOTICE
@@ -1,4 +1,4 @@
-Apache Allura (incubating)
+Apache Allura
 Copyright 2012-2014 The Apache Software Foundation
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/allura/blob/f9c813dc/ForgeGit/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeGit/NOTICE b/ForgeGit/NOTICE
index 3938e2b..69af9fe 100644
--- a/ForgeGit/NOTICE
+++ b/ForgeGit/NOTICE
@@ -1,4 +1,4 @@
-Apache Allura (incubating)
+Apache Allura
 Copyright 2012-2014 The Apache Software Foundation
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/allura/blob/f9c813dc/ForgeImporters/forgeimporters/base.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/base.py b/ForgeImporters/forgeimporters/base.py
index 996edb5..ae19156 100644
--- a/ForgeImporters/forgeimporters/base.py
+++ b/ForgeImporters/forgeimporters/base.py
@@ -169,7 +169,7 @@ class ProjectExtractor(object):
     def urlopen(url, retries=3, codes=(408,), **kw):
         req = urllib2.Request(url, **kw)
         req.add_header(
-            'User-Agent', 'Allura Data Importer (https://forge-allura.apache.org/p/allura/)')
+            'User-Agent', 'Allura Data Importer (https://allura.apache.org/)')
         return h.urlopen(req, retries=retries, codes=codes)
 
     def get_page(self, page_name_or_url, parser=None, **kw):

http://git-wip-us.apache.org/repos/asf/allura/blob/f9c813dc/ForgeImporters/forgeimporters/tests/test_base.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/tests/test_base.py b/ForgeImporters/forgeimporters/tests/test_base.py
index b2556a6..22844a0 100644
--- a/ForgeImporters/forgeimporters/tests/test_base.py
+++ b/ForgeImporters/forgeimporters/tests/test_base.py
@@ -40,7 +40,7 @@ class TestProjectExtractor(TestCase):
         Request.assert_called_once_with('myurl', data='foo')
         req = Request.return_value
         req.add_header.assert_called_once_with(
-            'User-Agent', 'Allura Data Importer (https://forge-allura.apache.org/p/allura/)')
+            'User-Agent', 'Allura Data Importer (https://allura.apache.org/)')
         urlopen.assert_called_once_with(req, retries=3, codes=(408,))
         self.assertEqual(r, urlopen.return_value)
 

http://git-wip-us.apache.org/repos/asf/allura/blob/f9c813dc/ForgeLink/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeLink/NOTICE b/ForgeLink/NOTICE
index 3938e2b..69af9fe 100644
--- a/ForgeLink/NOTICE
+++ b/ForgeLink/NOTICE
@@ -1,4 +1,4 @@
-Apache Allura (incubating)
+Apache Allura
 Copyright 2012-2014 The Apache Software Foundation
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/allura/blob/f9c813dc/ForgeSVN/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeSVN/NOTICE b/ForgeSVN/NOTICE
index 3938e2b..69af9fe 100644
--- a/ForgeSVN/NOTICE
+++ b/ForgeSVN/NOTICE
@@ -1,4 +1,4 @@
-Apache Allura (incubating)
+Apache Allura
 Copyright 2012-2014 The Apache Software Foundation
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/allura/blob/f9c813dc/ForgeTracker/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeTracker/NOTICE b/ForgeTracker/NOTICE
index 3938e2b..69af9fe 100644
--- a/ForgeTracker/NOTICE
+++ b/ForgeTracker/NOTICE
@@ -1,4 +1,4 @@
-Apache Allura (incubating)
+Apache Allura
 Copyright 2012-2014 The Apache Software Foundation
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/allura/blob/f9c813dc/ForgeWiki/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeWiki/NOTICE b/ForgeWiki/NOTICE
index 3938e2b..69af9fe 100644
--- a/ForgeWiki/NOTICE
+++ b/ForgeWiki/NOTICE
@@ -1,4 +1,4 @@
-Apache Allura (incubating)
+Apache Allura
 Copyright 2012-2014 The Apache Software Foundation
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/allura/blob/f9c813dc/INSTALL.markdown
----------------------------------------------------------------------
diff --git a/INSTALL.markdown b/INSTALL.markdown
index da90e4e..e890203 100644
--- a/INSTALL.markdown
+++ b/INSTALL.markdown
@@ -72,7 +72,7 @@ Now we can get down to actually getting the Allura code and dependencies downloa
 
     (env-allura)~$ mkdir src
     (env-allura)~$ cd src
-    (env-allura)~/src$ git clone https://git-wip-us.apache.org/repos/asf/incubator-allura.git allura
+    (env-allura)~/src$ git clone https://git-wip-us.apache.org/repos/asf/allura.git allura
 
 If you already reading this file from an Allura release or checkout, you're ready to continue.
 
@@ -156,7 +156,7 @@ register a new project in your own forge, visit /p/add_project
 
 * Read more documentation: <http://allura.sourceforge.net/docs/>
     * Including how to enable extra features: <http://allura.sourceforge.net/docs/installation.html>
-* Ask questions and discuss Allura on the <http://mail-archives.apache.org/mod_mbox/incubator-allura-dev/>
+* Ask questions and discuss Allura on the <http://mail-archives.apache.org/mod_mbox/allura-dev/>
 * Run the test suite (slow): `$ ALLURA_VALIDATION=none ./run_tests`
 * File bug reports at <https://sourceforge.net/p/allura/tickets/new/> (login required)
 * Contribute code according to this guide: <https://forge-allura.apache.org/p/allura/wiki/Contributing%20Code/>

http://git-wip-us.apache.org/repos/asf/allura/blob/f9c813dc/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 3938e2b..69af9fe 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache Allura (incubating)
+Apache Allura
 Copyright 2012-2014 The Apache Software Foundation
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/allura/blob/f9c813dc/NoWarnings/NOTICE
----------------------------------------------------------------------
diff --git a/NoWarnings/NOTICE b/NoWarnings/NOTICE
index 3938e2b..69af9fe 100644
--- a/NoWarnings/NOTICE
+++ b/NoWarnings/NOTICE
@@ -1,4 +1,4 @@
-Apache Allura (incubating)
+Apache Allura
 Copyright 2012-2014 The Apache Software Foundation
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/allura/blob/f9c813dc/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index 796edc7..5daeb0c 100644
--- a/README.markdown
+++ b/README.markdown
@@ -17,13 +17,13 @@
     under the License.
 -->
 
-Apache Allura (incubating)
-==========================
+Apache Allura
+=============
 
 Allura is an open source implementation of a software "forge", a web site that manages source code repositories, bug reports, discussions, mailing lists, wiki pages, blogs and more for any number of individual projects.
 
 To install Allura, see INSTALL.markdown
 
-Website: <https://forge-allura.apache.org/p/allura/>
+Website: <https://allura.apache.org/>
 
-To find more documentation, ask a question, file a bug, or contribute a patch, see the links on our website.  If you're not sure where to start, join the mailing list and ask.
\ No newline at end of file
+To find more documentation, ask a question, file a bug, or contribute a patch, see the links on our website.  If you're not sure where to start, join the mailing list and ask.

http://git-wip-us.apache.org/repos/asf/allura/blob/f9c813dc/scripts/asf-release.sh
----------------------------------------------------------------------
diff --git a/scripts/asf-release.sh b/scripts/asf-release.sh
index b33c47d..8e9581b 100755
--- a/scripts/asf-release.sh
+++ b/scripts/asf-release.sh
@@ -84,7 +84,7 @@ Hello,
 This is a call for a vote on Apache Allura $VERSION.
 
 Source tarball, signature and checksums are available at:
-  https://dist.apache.org/repos/dist/dev/incubator/allura/
+  https://dist.apache.org/repos/dist/dev/allura/
 
 Checksums:
   MD5:    $MD5_CHECKSUM
@@ -92,7 +92,7 @@ Checksums:
   SHA512: $SHA512_CHECKSUM
 
 The KEYS file can be found at:
-  http://www.apache.org/dist/incubator/allura/KEYS
+  http://www.apache.org/dist/allura/KEYS
 
 The release has been signed with key ($KEY):
   http://pgp.mit.edu:11371/pks/lookup?op=vindex&search=0x$FINGERPRINT
@@ -100,7 +100,7 @@ The release has been signed with key ($KEY):
 Source corresponding to this release can be found at:
   Commit: $COMMIT_SHA
   Tag:    asf_release_$VERSION
-  Browse: https://git-wip-us.apache.org/repos/asf?p=incubator-allura.git;a=shortlog;h=refs/tags/asf_release_$VERSION
+  Browse: https://git-wip-us.apache.org/repos/asf?p=allura.git;a=shortlog;h=refs/tags/asf_release_$VERSION
 
 The RAT report is available at:
   $RAT_LOG_PASTEBIN_URL

http://git-wip-us.apache.org/repos/asf/allura/blob/f9c813dc/vagrant/manifests/ubuntu-1204-server-amd64.pp
----------------------------------------------------------------------
diff --git a/vagrant/manifests/ubuntu-1204-server-amd64.pp b/vagrant/manifests/ubuntu-1204-server-amd64.pp
index b93456e..11fd2d0 100644
--- a/vagrant/manifests/ubuntu-1204-server-amd64.pp
+++ b/vagrant/manifests/ubuntu-1204-server-amd64.pp
@@ -78,7 +78,7 @@ file { "/var/log/allura":
 
 # clone Allura source from git
 exec { "clone repo":
-  command => "/usr/bin/git clone https://git-wip-us.apache.org/repos/asf/incubator-allura.git allura",
+  command => "/usr/bin/git clone https://git-wip-us.apache.org/repos/asf/allura.git allura",
   cwd     => "/vagrant",
   creates => "/vagrant/allura",
   user => "vagrant",


[3/4] git commit: [#7277] Remove "incubating" references

Posted by jo...@apache.org.
[#7277] Remove "incubating" references

Signed-off-by: Cory Johns <cj...@slashdotmedia.com>


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/cb78d455
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/cb78d455
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/cb78d455

Branch: refs/heads/cj/7277
Commit: cb78d4554172210cfea05c14fc12fdb2b6b9fa23
Parents: 829f967
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Wed Mar 26 18:53:14 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Mar 26 20:20:38 2014 +0000

----------------------------------------------------------------------
 Allura/allura/templates/jinja_master/theme_macros.html | 2 +-
 Allura/docs/conf.py                                    | 2 +-
 ForgeImporters/docs/conf.py                            | 2 +-
 scripts/asf-release.sh                                 | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/cb78d455/Allura/allura/templates/jinja_master/theme_macros.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/theme_macros.html b/Allura/allura/templates/jinja_master/theme_macros.html
index f188692..17702dd 100644
--- a/Allura/allura/templates/jinja_master/theme_macros.html
+++ b/Allura/allura/templates/jinja_master/theme_macros.html
@@ -36,7 +36,7 @@
 {%- macro footer(year, path_to_static='') %}
 <footer id="site-footer">
   <nav>
-      <p>This project is powered by <a href="https://forge-allura.apache.org/p/allura/">Apache Allura (incubating)</a>.</p>
+      <p>This project is powered by <a href="https://forge-allura.apache.org/p/allura/">Apache Allura</a>.</p>
       <p>
       Copyright &copy; 2014 The Apache Software Foundation, Licensed under the
       <a style="color: #069;" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>

http://git-wip-us.apache.org/repos/asf/allura/blob/cb78d455/Allura/docs/conf.py
----------------------------------------------------------------------
diff --git a/Allura/docs/conf.py b/Allura/docs/conf.py
index 081dd0c..14651da 100644
--- a/Allura/docs/conf.py
+++ b/Allura/docs/conf.py
@@ -53,7 +53,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = 'Apache Allura (incubating)'
+project = 'Apache Allura'
 copyright = '2012-2014 The Apache Software Foundation'
 
 # The version info for the project you're documenting, acts as replacement for

http://git-wip-us.apache.org/repos/asf/allura/blob/cb78d455/ForgeImporters/docs/conf.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/docs/conf.py b/ForgeImporters/docs/conf.py
index 26fc1b9..7783282 100644
--- a/ForgeImporters/docs/conf.py
+++ b/ForgeImporters/docs/conf.py
@@ -53,7 +53,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = 'Apache Allura (incubating)'
+project = 'Apache Allura'
 copyright = '2012-2014 The Apache Software Foundation'
 
 # The version info for the project you're documenting, acts as replacement for

http://git-wip-us.apache.org/repos/asf/allura/blob/cb78d455/scripts/asf-release.sh
----------------------------------------------------------------------
diff --git a/scripts/asf-release.sh b/scripts/asf-release.sh
index 19ac9e5..b33c47d 100755
--- a/scripts/asf-release.sh
+++ b/scripts/asf-release.sh
@@ -35,7 +35,7 @@ PREV_VERSION=`git tag -l asf_release_* | sort -rn | head -1 | sed -e 's/^asf_rel
 VERSION=`echo $PREV_VERSION | perl -pe '@_ = split /\./; $_[-1]++; $_ = join ".", @_'`
 prompt VERSION "Version" "$VERSION"
 
-RELEASE_BASE=allura-incubating-$VERSION
+RELEASE_BASE=allura-$VERSION
 RELEASE_DIR=$RELEASE_DIR_BASE/$RELEASE_BASE
 RELEASE_FILENAME=$RELEASE_BASE.tar.gz
 RELEASE_FILE=$RELEASE_DIR/$RELEASE_FILENAME
@@ -76,12 +76,12 @@ echo "    git push"
 echo "    git push --tags"
 echo "Then upload the files and signatures, and post the following:"
 echo "-------------------------------------------------------------"
-echo "Subject: [VOTE] Release of Apache Allura $VERSION (incubating)"
+echo "Subject: [VOTE] Release of Apache Allura $VERSION"
 echo "-------------------------------------------------------------"
 cat <<EOF
 Hello,
 
-This is a call for a vote on Apache Allura $VERSION incubating.
+This is a call for a vote on Apache Allura $VERSION.
 
 Source tarball, signature and checksums are available at:
   https://dist.apache.org/repos/dist/dev/incubator/allura/