...

ajenti-core/aj/__init__.py

@@ -7,7 +7,7 @@
 
 # imported by installer, no 3rd party imports here!
 
-__version__ = '2.0.43'
+__version__ = '2.0.46'
 
 # Global state
 

ajenti-core/aj/config.py

@@ -35,6 +35,7 @@ def ensure_structure(self):
         self.data.setdefault('max_sessions', 99)
         self.data.setdefault('auth', {})
         self.data['auth'].setdefault('emails', {})
+        self.data['auth'].setdefault('provider', 'os')
         self.data.setdefault('ssl', {})
         self.data['ssl'].setdefault('enable', False)
         self.data['ssl'].setdefault('certificate', None)

ajenti-core/aj/http.py

@@ -58,6 +58,7 @@ def dispatch(self, env, start_response):
 
         http_context.run_response()
         gevent.sleep(0)
+        print http_context.path, repr(content)[:1000]
         return content
 
 
@@ -266,7 +267,7 @@ def redirect(self, location):
         self.respond('302 Found')
         return ''
 
-    def gzip(self, content, compression=9):
+    def gzip(self, content, compression=6):
         """
         Returns a GZip compressed response with given ``content`` and correct headers
 

ajenti-core/requirements.txt

@@ -11,7 +11,7 @@ psutil>=2.2.1
 pyOpenSSL<0.14 # 0.14 breaks WantWrite retries
 python-daemon<2.0
 pyyaml
-requests>=0.12.0
+requests>=2
 setproctitle
 termcolor
 pip>=6

ajenti-panel/config.yml

@@ -1,7 +1,6 @@
 auth:
   allow_sudo: true
-  emails:
-    john.pankov@gmail.com: root
+  emails: {}
   provider: os
   users:
     root:
@@ -11,7 +10,7 @@ bind:
   host: 0.0.0.0
   mode: tcp
   port: 8000
-color: deeporange
+color: red
 max_sessions: 9
 name: Test Box
 ssl:

plugins/ace/.last-upload

@@ -1 +1 @@
-1430766912.22
+1432240981.24

plugins/augeas/.last-upload

@@ -1 +1 @@
-1430766928.65
+1432241023.4

plugins/augeas/api.py

@@ -56,7 +56,8 @@ def setd(self, path, value, default=None):
         """
         Sets `path` to `value`, or removes `path` if `value == default`
         """
-        self.set(path, value)
+        if value is not None:
+            self.set(path, value)
         if value == default:
             self.remove(path)
 

plugins/augeas/plugin.yml

@@ -2,7 +2,7 @@ name: augeas
 author: Ajenti project
 email: e@ajenti.org
 url: http://ajenti.org
-version: '0.6'
+version: '0.7'
 title: 'Augeas API'
 icon: cog
 dependencies:

plugins/auth_users/.last-upload

@@ -1 +1 @@
-1430766877.48
+1432240898.74

plugins/core/.last-upload

@@ -1 +1 @@
-1430766922.69
+1432241020.39

plugins/core/content/pages/index.html

@@ -6,6 +6,7 @@
 
         <meta name="apple-mobile-web-app-capable" content="yes">
         <meta name="apple-mobile-web-app-status-bar-style" content="black">
+        <meta name="theme-color" content="{{themeColorValue}}">
         <meta name="viewport" content="initial-scale=1, user-scalable=no, width=device-width, height=device-height, minimal-ui" />
 
         <link rel="stylesheet" href="%(prefix)s/resources/all.css" type="text/css">

plugins/core/plugin.yml

@@ -2,7 +2,7 @@ name: core
 author: Ajenti project
 email: e@ajenti.org
 url: http://ajenti.org
-version: '0.31'
+version: '0.35'
 title: Core
 icon: link
 dependencies: []

plugins/core/resources/css/app.less

@@ -65,20 +65,14 @@ body {
         line-height: 28px;
         text-align: center;
         font-size: 20px;
-        box-shadow: 0 2px 2px rgba(0, 0, 0, 0.25) inset;
-        border: none;
-        color: white;
-        text-shadow: 0 0 1px rgba(0,0,0,.5);
-        background-image: url('./core/resources/images/profile-normal.png');
-        background-size: cover;
+        border: 1px solid @brand-info;
+        color: @brand-info;
+        background: transparent;
         position: relative;
 
         &.superuser {
-            background-image: url('./core/resources/images/profile-root.png');
-        }
-
-        &[aria-expanded=true] {
-            box-shadow: 0 0 5px @brand-primary;
+            color: @brand-warning;
+            border: 1px solid @brand-warning;
         }
 
         .rank {
@@ -87,14 +81,13 @@ body {
             right: 0;
             width: 15px;
             height: 15px;
-            font-size: 14px;
+            font-size: 13px;
             line-height: 13px;
 
             text-align: center;
-            box-shadow: 0 1px 1px rgba(0, 0, 0, 0.25) inset, 0 0 1px rgba(0,0,0,.25);
-            color: white;
-            text-shadow: 0 0 1px rgba(0,0,0,.5);
-            background: #333;
+            border: 1px solid #555;
+            color: #555;
+            background: white;
             border-radius: 50%;
         }
     }

plugins/core/resources/css/bootstrap/bootstrap.less

@@ -12,7 +12,7 @@
 @import "../../vendor/bootstrap/less/scaffolding.less";
 @import "../../vendor/bootstrap/less/type.less";
 @import "../../vendor/bootstrap/less/code.less";
-@import "../../vendor/bootstrap/less/grid.less";
+@import "../../vendor/bootstrap/less/grid.less"; 
 @import "../../vendor/bootstrap/less/tables.less";
 @import "../../vendor/bootstrap/less/forms.less";
 @import "../../vendor/bootstrap/less/buttons.less";

plugins/core/resources/css/bootstrap/variables.less

@@ -25,7 +25,7 @@
 @body-bg: #ddd;
 @text-color: #666;
 
-@font-family-sans-serif:  "PT Sans", sans-serif;
+@font-family-sans-serif:  "PT Sans", pt_sans, sans-serif;
 @font-family-base:        @font-family-sans-serif;
 
 @btn-default-border:             #eee;

plugins/core/resources/css/responsive.less

@@ -36,4 +36,15 @@
         display: block;
         .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
     }
+
+    #toast-container {
+        left: 0;
+        top: 0;
+        width: 100%;
+
+        &>.toast {
+            width: 100%;
+            border-radius: 0;
+        }
+    }
 }

plugins/core/resources/js/core/controllers/root.controller.coffee

@@ -17,7 +17,7 @@ angular.module('core').controller 'CoreRootController', ($scope, $rootScope, $lo
     console.log('Plugins', ajentiPlugins)
     console.groupEnd()
 
-    $scope.navigationPresent = $location.path().indexOf('/view/login') != 0
+    $scope.navigationPresent = $location.path().indexOf('/view/login') == -1
 
     feedback.init()
 

plugins/core/resources/js/core/module.coffee

@@ -22,7 +22,7 @@ angular.module('core').config ($httpProvider, $animateProvider, $compileProvider
 
 
 angular.module('core').run () ->
-    FastClick.attach(document.body)
+    FastClick.attach(document.body) 
 
 
 Array.prototype.remove = (args...) ->

plugins/core/resources/js/core/services/favicon.service.coffee

@@ -13,6 +13,8 @@ angular.module('core').service 'favicon', ($rootScope, identity, customization)
     }
 
     @set = (color) =>
+        $rootScope.themeColorValue = @colors[color]
+
         canvas = document.createElement 'canvas'
         canvas.width = 16
         canvas.height = 16

plugins/core/resources/partial/sidebarItem.html

@@ -7,7 +7,7 @@ <h5 ng:show="item.isTopLevel">
             <i ng:if="item.expanded" class="fa fa-fw fa-caret-down"></i>
             <i ng:if="!item.expanded" class="fa fa-fw fa-caret-right"></i>
         </a>
-        <a ng:href="{{item.url[0] == '/' ? (urlPrefix + item.url) : item.url}}" ng:click="feedback.emit('sidebar', {id: item.id})" class="link">
+        <a ng:href="{{item.url[0] == '/' ? (urlPrefix + item.url) : item.url}}" ng:mouseup="feedback.emit('sidebar', {id: item.id})" class="link">
             <i class="fa fa-fw fa-{{item.icon}}"></i> {{item.name}}
         </a>
     </div>

plugins/dashboard/.last-upload

@@ -1 +1 @@
-1430766868.81
+1432240888.61

plugins/datetime/.last-upload

@@ -1 +1 @@
-1430766884.57
+1432240907.49

plugins/filemanager/.last-upload

@@ -1 +1 @@
-1430766883.08
+1432240905.75

plugins/filemanager/plugin.yml

@@ -2,7 +2,7 @@ name: filemanager
 author: Ajenti project
 email: e@ajenti.org
 url: http://ajenti.org
-version: '0.12'
+version: '0.13'
 title: 'File Manager'
 icon: folder-o
 dependencies:

plugins/filesystem/.last-upload

@@ -1 +1 @@
-1430766930.93
+1432241025.77

plugins/network/.last-upload

@@ -1 +1 @@
-1430766875.95
+1432240897.07

plugins/notepad/.last-upload

@@ -1 +1 @@
-1430766870.26
+1432240890.29

plugins/notepad/plugin.yml

@@ -2,7 +2,7 @@ name: notepad
 author: Ajenti project
 email: e@ajenti.org
 url: http://ajenti.org
-version: '0.11'
+version: '0.12'
 title: 'Notepad'
 icon: pencil
 dependencies:

plugins/packages/.last-upload

@@ -1 +1 @@
-1430766880.04
+1432240902.16

plugins/passwd/.last-upload

@@ -1 +1 @@
-1430766871.69
+1432240891.83

plugins/plugins/.last-upload

@@ -1 +1 @@
-1430766881.56
+1432240903.86

plugins/plugins/plugin.yml

@@ -2,7 +2,7 @@ name: plugins
 author: Ajenti project
 email: e@ajenti.org
 url: http://ajenti.org
-version: '0.29'
+version: '0.30'
 title: 'Plugins'
 icon: th-large
 dependencies:

plugins/plugins/tasks.py

@@ -1,6 +1,4 @@
-import os
 import subprocess
-import shutil
 
 from aj.plugins.core.api.tasks import Task
 

plugins/plugins/views.py

@@ -1,4 +1,6 @@
+import os
 import requests
+import shutil
 import subprocess
 
 import aj
@@ -89,6 +91,8 @@ def handle_api_pypi_uninstall(self, http_context, name=None):
     @url(r'/api/plugins/repo/list')
     @endpoint(api=True)
     def handle_api_repo_list(self, http_context):
+        if os.path.exists('/root/.cache/pip'):
+            shutil.rmtree('/root/.cache/pip')
         try:
             return requests.get('http://ajenti.org/plugins/list').json()
         except Exception as e:

plugins/power/.last-upload

@@ -1 +1 @@
-1430766927.17
+1432241021.87

plugins/services/.last-upload

@@ -1 +1 @@
-1430766878.81
+1432240900.4

plugins/services/plugin.yml

@@ -2,7 +2,7 @@ name: services
 author: Ajenti project
 email: e@ajenti.org
 url: http://ajenti.org
-version: '0.15'
+version: '0.17'
 title: 'Services'
 icon: cogs
 dependencies:

plugins/services/widget.py

@@ -14,9 +14,13 @@ def __init__(self, context):
         Widget.__init__(self, context)
 
     def get_value(self, config):
+        manager_id = config.get('manager_id', None)
+        service_id = config.get('service_id', None)
+        if not manager_id or not service_id:
+            return None
         for mgr in ServiceManager.all(self.context):
-            if mgr.id == config.get('manager_id', None):
-                svc = mgr.get(config.get('service_id', None))
+            if mgr.id == manager_id:
+                svc = mgr.get_service(service_id)
                 return {
                     'id': svc.id,
                     'name': svc.name,

plugins/settings/.last-upload

@@ -1 +1 @@
-1430766873.16
+1432240893.48

plugins/settings/plugin.yml

@@ -2,7 +2,7 @@ name: settings
 author: Ajenti project
 email: e@ajenti.org
 url: http://ajenti.org
-version: '0.14'
+version: '0.15'
 title: 'Settings'
 icon: wrench
 dependencies:

plugins/settings/resources/js/controllers/index.controller.coffee

@@ -37,7 +37,7 @@ angular.module('ajenti.settings').controller 'SettingsIndexController', ($scope,
     .catch () ->
         notify.error 'Could not load config'
 
-    $scope.$watch 'config.color', () ->
+    $scope.$watch 'config.data.color', () ->
         if config.data
             identity.color = config.data.color
 

plugins/supervisor/.last-upload

@@ -1 +1 @@
-1430766874.49
+1432240895.21

plugins/terminal/.last-upload

@@ -1 +1 @@
-1430766886.25
+1432240909.55