You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2016/11/30 18:01:11 UTC
[1/5] allura git commit: Use apt-get instead of aptitude (which isn't
installed by default on ubuntu 16.04)
Repository: allura
Updated Branches:
refs/heads/master e40100b4d -> c82371968
Use apt-get instead of aptitude (which isn't installed by default on ubuntu 16.04)
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/fbea7e64
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/fbea7e64
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/fbea7e64
Branch: refs/heads/master
Commit: fbea7e64af680ddb27a1839292ccc45ce79b5247
Parents: e40100b
Author: Dave Brondsema <da...@brondsema.net>
Authored: Wed Nov 16 16:30:18 2016 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Nov 16 16:30:18 2016 -0500
----------------------------------------------------------------------
Allura/docs/getting_started/installation.rst | 6 +++---
Allura/docs/getting_started/scm_host.rst | 4 ++--
Allura/docs/getting_started/scm_host_ssh.rst | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/fbea7e64/Allura/docs/getting_started/installation.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/getting_started/installation.rst b/Allura/docs/getting_started/installation.rst
index f6d1a93..610d08a 100644
--- a/Allura/docs/getting_started/installation.rst
+++ b/Allura/docs/getting_started/installation.rst
@@ -51,7 +51,7 @@ Before we begin, you'll need to install some system packages.
.. code-block:: bash
- ~$ sudo aptitude install git-core python-dev libssl-dev libldap2-dev libsasl2-dev libjpeg8-dev zlib1g-dev
+ ~$ sudo apt-get install git-core python-dev libssl-dev libldap2-dev libsasl2-dev libjpeg8-dev zlib1g-dev
To install MongoDB, follow the instructions `here <https://docs.mongodb.org/manual/tutorial/install-mongodb-on-ubuntu/>`_.
@@ -59,7 +59,7 @@ Optional, for SVN support:
.. code-block:: bash
- ~$ sudo aptitude install subversion python-svn
+ ~$ sudo apt-get install subversion python-svn
Setting up a virtual python environment
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -68,7 +68,7 @@ The first step to installing the Allura platform is installing a virtual environ
.. code-block:: bash
- ~$ sudo aptitude install python-pip
+ ~$ sudo apt-get install python-pip
~$ sudo pip install virtualenv
Once you have virtualenv installed, you need to create a virtual environment. We'll call our Allura environment 'env-allura'.
http://git-wip-us.apache.org/repos/asf/allura/blob/fbea7e64/Allura/docs/getting_started/scm_host.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/getting_started/scm_host.rst b/Allura/docs/getting_started/scm_host.rst
index 9141edf..fc3a941 100644
--- a/Allura/docs/getting_started/scm_host.rst
+++ b/Allura/docs/getting_started/scm_host.rst
@@ -136,7 +136,7 @@ that all svn repos can be dynamically served.
.. code-block:: console
- sudo aptitude install libapache2-svn
+ sudo apt-get install libapache2-svn
Test accessing http://localhost/ (`localhost:8088` if using Vagrant).
@@ -192,7 +192,7 @@ First, you need to ensure that mod_python is installed:
.. code-block:: console
- sudo aptitude install libapache2-mod-python
+ sudo apt-get install libapache2-mod-python
Then, in the VirtualHost section where you send SCM requests to git, SVN, or Hg, add the
access handler, e.g.:
http://git-wip-us.apache.org/repos/asf/allura/blob/fbea7e64/Allura/docs/getting_started/scm_host_ssh.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/getting_started/scm_host_ssh.rst b/Allura/docs/getting_started/scm_host_ssh.rst
index bba57cf..1fc78c8 100644
--- a/Allura/docs/getting_started/scm_host_ssh.rst
+++ b/Allura/docs/getting_started/scm_host_ssh.rst
@@ -45,7 +45,7 @@ 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`
+Install debootstrap and schroot: :program:`apt-get install debootstrap schroot`
Append the following text to the file :file:`/etc/schroot/schroot.conf`
[2/5] allura git commit: Specify python 2.7 and ubuntu 16.04
Posted by br...@apache.org.
Specify python 2.7 and ubuntu 16.04
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/ba64bf49
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/ba64bf49
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/ba64bf49
Branch: refs/heads/master
Commit: ba64bf4972f5be123873c865a9a68a1e9cc5c470
Parents: fbea7e6
Author: Dave Brondsema <da...@brondsema.net>
Authored: Wed Nov 16 16:30:58 2016 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Nov 16 16:30:58 2016 -0500
----------------------------------------------------------------------
Allura/docs/getting_started/installation.rst | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/ba64bf49/Allura/docs/getting_started/installation.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/getting_started/installation.rst b/Allura/docs/getting_started/installation.rst
index 610d08a..5e30b77 100644
--- a/Allura/docs/getting_started/installation.rst
+++ b/Allura/docs/getting_started/installation.rst
@@ -29,11 +29,11 @@ Step-by-Step Installation
For a simpler setup using Docker images, see :ref:`docker-install` instead.
-In these instructions, we'll use `VirtualBox <http://www.virtualbox.org>`__ and `Ubuntu 14.04 <http://ubuntu.com>`_ (12.04 works too) to create a disposable sandbox for Allura development/testing. Allura should work on other Linux systems (including OSX), but setting up all the dependencies will be different.
+In these instructions, we'll use `VirtualBox <http://www.virtualbox.org>`__ and `Ubuntu 16.04 <http://ubuntu.com>`_ (15.04 works too) to create a disposable sandbox for Allura development/testing. Allura should work on other Linux systems (including OSX), but setting up all the dependencies will be different.
* Download and install `VirtualBox <http://www.virtualbox.org/wiki/Downloads>`__ for your platform.
-* Download a minimal `Ubuntu 14.04 64-bit ISO <https://help.ubuntu.com/community/Installation/MinimalCD>`_.
+* Download a minimal `Ubuntu 16.04 64-bit ISO <https://help.ubuntu.com/community/Installation/MinimalCD>`_.
* Create a new virtual machine in Virtual Box, selecting Ubuntu (64 bit) as the OS type. The rest of the wizards' defaults are fine.
@@ -51,7 +51,7 @@ Before we begin, you'll need to install some system packages.
.. code-block:: bash
- ~$ sudo apt-get install git-core python-dev libssl-dev libldap2-dev libsasl2-dev libjpeg8-dev zlib1g-dev
+ ~$ sudo apt-get install git-core python2.7-dev libssl-dev libldap2-dev libsasl2-dev libjpeg8-dev zlib1g-dev
To install MongoDB, follow the instructions `here <https://docs.mongodb.org/manual/tutorial/install-mongodb-on-ubuntu/>`_.
[5/5] allura git commit: Update pysolr (and its requests dependency)
so indexing users works (date field format was no longer working)
Posted by br...@apache.org.
Update pysolr (and its requests dependency) so indexing users works (date field format was no longer working)
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/c8237196
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/c8237196
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/c8237196
Branch: refs/heads/master
Commit: c82371968a54625e6a842355d2a2da2f4235a75b
Parents: cb9f477
Author: Dave Brondsema <da...@brondsema.net>
Authored: Tue Nov 29 11:31:34 2016 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Tue Nov 29 11:31:34 2016 -0500
----------------------------------------------------------------------
requirements.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/c8237196/requirements.txt
----------------------------------------------------------------------
diff --git a/requirements.txt b/requirements.txt
index fc32006..0ea16c0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -32,13 +32,13 @@ poster==0.8.1
Pygments==2.0.2
pymongo==2.8.1
Pypeline==0.2
-pysolr==2.1.0b0
+pysolr==3.6.0
python-dateutil==1.5
python-magic==0.4.3
python-oembed==0.2.1
pytz==2014.10
qrcode==5.3
-requests==2.0.0
+requests==2.12.1
oauthlib==0.4.2
requests-oauthlib==0.4.0
# for taskd proc name switching
[3/5] allura git commit: Make this section show the recommended
command more prominently, and alternate in a note
Posted by br...@apache.org.
Make this section show the recommended command more prominently, and alternate in a note
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/6945bbdc
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/6945bbdc
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/6945bbdc
Branch: refs/heads/master
Commit: 6945bbdc908c0ee0ce9bba0381a84f39961f5a4e
Parents: ba64bf4
Author: Dave Brondsema <da...@brondsema.net>
Authored: Wed Nov 16 16:31:26 2016 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Nov 16 16:31:26 2016 -0500
----------------------------------------------------------------------
Allura/docs/getting_started/installation.rst | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/6945bbdc/Allura/docs/getting_started/installation.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/getting_started/installation.rst b/Allura/docs/getting_started/installation.rst
index 5e30b77..a015a18 100644
--- a/Allura/docs/getting_started/installation.rst
+++ b/Allura/docs/getting_started/installation.rst
@@ -122,15 +122,23 @@ Optional, for SVN support: symlink the system pysvn package into our virtual env
(env-allura)~/src/allura$ ln -s /usr/lib/python2.7/dist-packages/pysvn ~/env-allura/lib/python2.7/site-packages/
-Next, run :code:`./rebuild-all.bash` to setup all the Allura applications. If you only want to use a few tools, run:
+Next, run this to set up all the Allura tools:
.. code-block:: bash
- (env-allura)~/src/allura$ cd Allura
- (env-allura)~/src/allura/Allura$ python setup.py develop
- (env-allura)~/src/allura/Allura$ cd ../ForgeWiki # required tool
- (env-allura)~/src/allura/ForgeWiki$ python setup.py develop
- # repeat for any other tools you want to use
+ (env-allura)~/src/allura$ ./rebuild-all.bash
+
+.. note::
+
+ If you only want to use a few tools, run this instead:
+
+ .. code-block:: bash
+
+ (env-allura)~/src/allura$ cd Allura
+ (env-allura)~/src/allura/Allura$ python setup.py develop
+ (env-allura)~/src/allura/Allura$ cd ../ForgeWiki # required tool
+ (env-allura)~/src/allura/ForgeWiki$ python setup.py develop
+ # repeat for any other tools you want to use
Initializing the environment
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[4/5] allura git commit: Update docker images
Posted by br...@apache.org.
Update docker images
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/cb9f4774
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/cb9f4774
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/cb9f4774
Branch: refs/heads/master
Commit: cb9f4774b6af175af2545811c8cd800cd4c1dae3
Parents: 6945bbd
Author: Dave Brondsema <da...@brondsema.net>
Authored: Thu Nov 17 15:25:59 2016 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Thu Nov 17 15:25:59 2016 -0500
----------------------------------------------------------------------
Dockerfile | 7 ++++---
docker-compose.yml | 2 +-
scm_config/git-http/Dockerfile | 2 +-
solr_config/allura/conf/schema.xml | 8 +-------
4 files changed, 7 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/cb9f4774/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
index f04b37b..9661f15 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,11 +15,11 @@
# specific language governing permissions and limitations
# under the License.
-FROM ubuntu:14.04
+FROM ubuntu:16.04
RUN apt-get update && apt-get install -y \
git-core \
- python-dev \
+ python2.7-dev \
libssl-dev \
libldap2-dev \
libsasl2-dev \
@@ -29,7 +29,8 @@ RUN apt-get update && apt-get install -y \
zip \
subversion \
python-svn \
- curl
+ curl \
+ sudo
# up-to-date version of node & npm
RUN curl --silent --location https://deb.nodesource.com/setup_4.x | sudo bash - && \
http://git-wip-us.apache.org/repos/asf/allura/blob/cb9f4774/docker-compose.yml
----------------------------------------------------------------------
diff --git a/docker-compose.yml b/docker-compose.yml
index 316046e..ed19004 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -42,7 +42,7 @@ taskd:
- outmail
solr:
- image: solr:5.3.1
+ image: solr:6-alpine # alpine is a very small distro base
ports:
- "8983:8983"
volumes:
http://git-wip-us.apache.org/repos/asf/allura/blob/cb9f4774/scm_config/git-http/Dockerfile
----------------------------------------------------------------------
diff --git a/scm_config/git-http/Dockerfile b/scm_config/git-http/Dockerfile
index 8f5650f..b2e1b28 100644
--- a/scm_config/git-http/Dockerfile
+++ b/scm_config/git-http/Dockerfile
@@ -20,7 +20,7 @@
# not inspired by https://hub.docker.com/_/httpd/ which does a custom source-based install of httpd
# match main allura Dockerfile, for shared base
-FROM ubuntu:14.04
+FROM ubuntu:16.04
RUN apt-get update && apt-get install -y \
apache2 \
http://git-wip-us.apache.org/repos/asf/allura/blob/cb9f4774/solr_config/allura/conf/schema.xml
----------------------------------------------------------------------
diff --git a/solr_config/allura/conf/schema.xml b/solr_config/allura/conf/schema.xml
index 35c145e..afca496 100644
--- a/solr_config/allura/conf/schema.xml
+++ b/solr_config/allura/conf/schema.xml
@@ -505,12 +505,6 @@
<!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
<fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
-
- <!-- An alternative geospatial field type new to Solr 4. It supports multiValued and polygon shapes.
- For more information about this and other Spatial fields new to Solr 4, see:
- http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4
- -->
- <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
- geo="true" distErrPct="0.025" maxDistErr="0.000009" units="degrees" />
+
</types>
</schema>