Changeset 1436 for zero-center/trunk/fuentes

Timestamp:

May 9, 2016, 12:53:14 PM (5 years ago)

Author:

jrpelegrina

Message:

WIP in blacklist slave

Location:

zero-center/trunk/fuentes

Files:

• install-files/usr/share/zero-center/zero-center.py (modified) (2 diffs)
• n4dvars/SLAVE_BLACKLIST (modified) (1 diff)

zero-center/trunk/fuentes/install-files/usr/share/zero-center/zero-center.py

@@ -211 +211 @@
                                                 if "DISTRIB_DESCRIPTION" in line:
                                                         self.msg_text=line.split("=")[1]
+                        #Load slave_blacklist
+                        self.blacklist=self.client.get_variable("","VariablesManager","SLAVE_BLACKLIST")
 
                 except:
@@ -1058 +1060 @@
         def app_clicked(self,widget,app):
                 if not os.environ["MASTER_SERVER_IP"]:
-                        self.open_dialog("Warning","<b>%s</b> ESTAS EN UN ESCLAVO")
-                        return -1
-                
+                        if self.blacklist[app]:
+                                self.open_dialog("Warning",_("<b>%s</b> Operation not allowed on a slave server"),False)
+                                return -1
                 if app["ID"] in self.configured_apps:
                         ret=self.open_dialog("Warning",_("<b>%s</b> is already configured. Do you want to execute it again?")%self.get_name(app),True)

zero-center/trunk/fuentes/n4dvars/SLAVE_BLACKLIST

@@ -9 +9 @@
                 "description": "List of blacklisted services in slave servers",
                 "value": {
-                        "install-moodle": ["moodle"]
+                        "install-moodle": ["moodle"],
+                        "lliurex-owncloud":["owncloud"],
+                        "lliurex-pmb-installer":["pmb","opac"],
+                        "lliurex-freeradius":[]
                 }