Changeset 1905 for n4d-proxy/trunk/fuentes/install.n4d-proxy/usr/share/n4d/python-plugins/ProxyManager.py

Timestamp:

Jun 14, 2016, 1:45:42 PM (5 years ago)

Author:

Juanma

Message:

fix backup restore from trusty

File:

• n4d-proxy/trunk/fuentes/install.n4d-proxy/usr/share/n4d/python-plugins/ProxyManager.py (modified) (4 diffs)

n4d-proxy/trunk/fuentes/install.n4d-proxy/usr/share/n4d/python-plugins/ProxyManager.py

@@ -88 +88 @@
                                 
                                 return [False,"Backup file not found"]
-                        
+
                         if os.path.exists(file_path):
                                 
@@ -96 +96 @@
                                 tar.close()
                                 
+                                #FIX squid dir from backups <= 15.05
+                                version=objects["ServerBackupManager"].restoring_version
+                                majorBackupVersion=int(version[0:version.find('.')])
                                 for f in self.proxy_file_list:
-                                        tmp_path=tmp_dir+f
+                                        auxFile=f
+                                        if auxFile == "/etc/squid/squid.conf" :
+                                                if majorBackupVersion<=15:
+                                                        auxFile='/etc/squid3/squid.conf'
+                                        
+#                                       tmp_path=tmp_dir+f
+                                        tmp_path=tmp_dir+auxFile
                                         shutil.copy(tmp_path,f)
                                         
-                                        
                                 for d in self.proxy_dirs:
-                                        tmp_path=tmp_dir+d
+                                        auxDir=d
+                                        if auxDir == "/etc/squid/lliurex/" :
+                                                if majorBackupVersion<=15:
+                                                        auxDir='/etc/squid3/lliurex/'
+                                                
+#                                       tmp_path=tmp_dir+d
+                                        tmp_path=tmp_dir+auxDir
                                         if os.path.exists(tmp_path):
                                                 cmd="cp -r " + tmp_path +"/* "  + d
@@ -108 +122 @@
                                                         os.makedirs(d)
                                                 os.system(cmd)
-                                        
-                                
                                 
                                 try:
-                                        if objects["ServerBackupManager"].restoring_version=="14.06":
-                                                
+                                        if majorBackupVersion<=15 :
+
+#                                       if objects["ServerBackupManager"].restoring_version=="14.06":
+                                                        
                                                 print("[ProxyManager] Fixing squid.conf ...")
                                                 
@@ -123 +137 @@
                                                 for line in lines:
                                                         if "acl manager proto cache_object" not in line:
-                                                        
+                                                                #FIX squid dir from backups <= 15.05
+                                                                line=line.replace ("squid3","squid")
+                                                                if "dns_nameservers" in line:
+                                                                        line="dns_nameservers 127.0.0.1\n"
+                                                                
                                                                 f.write(line)