Merge pull request #178 from SpiderOak/management_console_2.0.3

Management console 2.0.3
SpiderOak · Oct 10, 2014 · 2361c7a · 2361c7a
2 parents 072975d + 51ccd8d
commit 2361c7a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/netkes/account_mgr/__init__.py b/netkes/account_mgr/__init__.py
@@ -58,8 +58,6 @@ def admin_token_auth(config, user, username, password):
     log = logging.getLogger("admin_token_auth")
     api = get_api(config)
     user_token = dict(avatar_id=user['avatar_id'], token=password)
-    if not user['enabled']:
-        return False
 
     with get_cursor(config) as cur:
         cur.execute(SELECT_ADMIN_TOKEN, user_token)

diff --git a/upgrade/gather_resources.sh b/upgrade/gather_resources.sh
@@ -21,4 +21,4 @@ pip install --download=. Django==1.5.5
 pip install --download=. pytz==2013.8
 pip install --download=. pycrypto==2.4.1
 
-
+wget http://archive.ubuntu.com/ubuntu/pool/main/b/bash/bash_4.1-2ubuntu3.5_amd64.deb 
diff --git a/upgrade/upgrade.sh b/upgrade/upgrade.sh
@@ -85,6 +85,9 @@ echo "Running additional update scripts..."
 sudo bash -c "PYTHONPATH=/opt/openmanage python /opt/openmanage/upgrade/apply_scripts.py"
 
 apt-get -y remove python-crypto
+
+find /opt/openmanage/upgrade/resources/ -name '*.deb' | xargs dpkg -i
+
 pip install -r /opt/openmanage/upgrade/requirements.txt
 
 # Restart services
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,4 +21,4 @@ pip install --download=. Django==1.5.5
		pip install --download=. pytz==2013.8
		pip install --download=. pycrypto==2.4.1


		wget http://archive.ubuntu.com/ubuntu/pool/main/b/bash/bash_4.1-2ubuntu3.5_amd64.deb