ignore

.gitignore

@@ -45,3 +45,4 @@ test.py
 .history/
 .test/
 *.mo
+

apps/common/plugins/es.py

@@ -190,8 +190,7 @@ class ES(object):
                 mappings['aliases'] = {
                     self.query_index: {}
                 }
-            if self.es.indices.exists(index=self.index):
-                return
+
             try:
                 self.es.indices.create(index=self.index, body=mappings)
             except (RequestError, BadRequestError) as e:

apps/rbac/builtin.py

@@ -30,7 +30,6 @@ system_user_perms = (
     ('authentication', 'temptoken', 'add,change,view', 'temptoken'),
     ('authentication', 'accesskey', '*', '*'),
     ('authentication', 'passkey', '*', '*'),
-    ('authentication', 'sshkey', '*', '*'),
     ('tickets', 'ticket', 'view', 'ticket'),
 )
 system_user_perms += (user_perms + _view_all_joined_org_perms)