Skip to content

Commit

Permalink
Rev to version 1.1.2 for development.
Browse files Browse the repository at this point in the history
  • Loading branch information
onyxfish committed Nov 30, 2013
1 parent d192f89 commit 56d04b3
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 7 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
1.1.2
-----



1.1.1
-----

Expand Down
2 changes: 1 addition & 1 deletion config/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
SOLR_DIRECTORY = '/var/solr'

# Miscellaneous configuration
PANDA_VERSION = '1.1.1'
PANDA_VERSION = '1.1.2'
PANDA_DEFAULT_SEARCH_GROUPS = 10
PANDA_DEFAULT_SEARCH_ROWS_PER_GROUP = 5
PANDA_DEFAULT_SEARCH_ROWS = 50
Expand Down
2 changes: 1 addition & 1 deletion docs/amazon.rst
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Click "Next" and keep clicking "Next" until you get to "Configure Security Group

Once your new server is available, SSH into it and execute the following commands::

wget https://raw.github.com/pandaproject/panda/1.1.1/setup_panda.sh
wget https://raw.github.com/pandaproject/panda/1.1.2/setup_panda.sh
sudo bash setup_panda.sh

The disadvantage of this method is that you will need to wait while the setup script is run. This normally takes 15-20 minutes.
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
# built documents.
#
# The short X.Y version.
version = '1.1.1'
version = '1.1.2'
# The full version, including alpha/beta/rc tags.
release = '1.1.1'
release = '1.1.2'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
4 changes: 4 additions & 0 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
PANDA: A Newsroom Data Appliance |release|
==========================================

.. warning::

This documentation is for the version of PANDA **currently under development**. Were you looking for `version 1.1.1 <http://panda.readthedocs.org/en/1.1.1/>`_ documentation?

About
=====

Expand Down
2 changes: 1 addition & 1 deletion docs/self-install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ SSH into your server and run the following setup commands:

.. code-block:: bash
wget https://raw.github.com/pandaproject/panda/1.1.1/setup_panda.sh
wget https://raw.github.com/pandaproject/panda/1.1.2/setup_panda.sh
sudo bash setup_panda.sh
Note that the setup script **must** be run with sudo.
Expand Down
2 changes: 1 addition & 1 deletion docs/ssl.rst
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ The last thing you'll need to do is reconfigure PANDA's webserver (Nginx) to use

.. code-block:: bash
sudo wget https://raw.github.com/pandaproject/panda/1.1.1/setup_panda/nginx_ssl -O /etc/nginx/sites-available/panda
sudo wget https://raw.github.com/pandaproject/panda/1.1.2/setup_panda/nginx_ssl -O /etc/nginx/sites-available/panda
sudo service nginx restart
Your PANDA should now redirect all unsecured requests to a secure ``https://`` url.
Expand Down
2 changes: 1 addition & 1 deletion setup_panda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ exec 1> >(tee /var/log/panda-install.log) 2>&1

echo "PANDA installation beginning."

VERSION="1.1.1"
VERSION="1.1.2"
CONFIG_PATH="/opt/panda/setup_panda"

# Setup environment variables
Expand Down

0 comments on commit 56d04b3

Please sign in to comment.