Changeset 2036
- Timestamp:
- Jun 28, 2016, 11:31:22 AM (5 years ago)
- Location:
- lliurex-mirror/trunk/fuentes/n4d-lliurex-mirror.install
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
lliurex-mirror/trunk/fuentes/n4d-lliurex-mirror.install/etc/n4d/conf.d/MirrorManager
r1960 r2036 19 19 get_checksum_validation=anonymous,* 20 20 get_available_mirrors=anonymous,* 21 stopupdate=adm,admins -
lliurex-mirror/trunk/fuentes/n4d-lliurex-mirror.install/usr/share/lliurex-mirror/conf/llx14.json
r1957 r2036 4 4 "SECTIONS": ["main", "main/debian-installer", "universe", "restricted", "multiverse", "partner"], 5 5 "MIRRORPATH": "/net/mirror/llx1406", 6 "DISTRO ": "precise",6 "DISTROS": ["precise","precise-updates","precise-security"], 7 7 "IGN_GPG":1, 8 8 "IGN_RELEASE":0, -
lliurex-mirror/trunk/fuentes/n4d-lliurex-mirror.install/usr/share/lliurex-mirror/conf/llx15.json
r1957 r2036 4 4 "SECTIONS": ["main", "main/debian-installer", "universe", "restricted", "multiverse", "partner"], 5 5 "MIRRORPATH": "/net/mirror/llx1505", 6 "DISTRO ": "trusty",6 "DISTROS": ["trusty","trusty-security","trusty-updates"], 7 7 "IGN_GPG":1, 8 8 "IGN_RELEASE":0, -
lliurex-mirror/trunk/fuentes/n4d-lliurex-mirror.install/usr/share/lliurex-mirror/conf/llx16.json
r1957 r2036 4 4 "SECTIONS": ["main", "main/debian-installer", "universe", "restricted", "multiverse", "partner"], 5 5 "MIRRORPATH": "/net/mirror/llx16", 6 "DISTRO ": "xenial",6 "DISTROS": ["xenial","xenial-updates","xenial-security"], 7 7 "IGN_GPG":1, 8 8 "IGN_RELEASE":0, -
lliurex-mirror/trunk/fuentes/n4d-lliurex-mirror.install/usr/share/n4d/python-plugins/MirrorManager.py
r1965 r2036 28 28 self.distro="llx16" 29 29 self.httpd = None 30 self.debmirrorprocess = None 30 31 31 32 self.tpl_env = Environment(loader=FileSystemLoader('/usr/share/n4d/templates/lliurex-mirror')) … … 128 129 self.variable["internal"]['status_mirror'] = "Working" 129 130 self.n4d_vars.set_variable("LLIUREXMIRROR",self.variable) 130 131 filelog = open('/var/log/lliurex-mirror.log','w') 131 132 self.build_debmirror_config(distro) 132 133 os.remove('/etc/debmirror.conf') 133 134 os.symlink(os.path.join(self.debmirrorconfpath,distro),'/etc/debmirror.conf') 134 child=pexpect.spawn("/usr/bin/debmirror")135 self.debmirrorprocess=pexpect.spawn("/usr/bin/debmirror") 135 136 try: 136 137 objects["ZCenterVariables"].add_pulsating_color("lliurexmirror") … … 139 140 while True: 140 141 try: 141 child.expect('\n')142 line = child.before143 print(line)142 self.debmirrorprocess.expect('\n') 143 line =self.debmirrorprocess.before 144 filelog.write(line) 144 145 line1=line.strip("\n") 145 146 if line1.startswith("[") and line1[5] == "]": 146 self.percentage=(int(line1[1:4].strip()), child.exitstatus)147 self.percentage=(int(line1[1:4].strip()),self.debmirrorprocess.exitstatus) 147 148 except pexpect.EOF: 148 line1 = child.before149 line1 = self.debmirrorprocess.before 149 150 if line1 != "" and line1.startswith("[") and line1[5] == "]": 150 self.percentage=(int(line1[1:4].strip()), child.exitstatus)151 152 child.close()153 status = child.exitstatus151 self.percentage=(int(line1[1:4].strip()),self.debmirrorprocess.exitstatus) 152 filelog.write(line1) 153 self.debmirrorprocess.close() 154 status = self.debmirrorprocess.exitstatus 154 155 self.percentage=(self.percentage[0],status) 155 156 … … 161 162 self.n4d_vars.set_variable("LLIUREXMIRROR",self.variable) 162 163 break 163 164 filelog.close() 164 165 self.set_mirror_info(distro) 165 166 … … 372 373 versions = [ version.replace('.json','') for version in versions if version.endswith('.json')] 373 374 return {'status':True,'msg':versions} 375 376 def stopupdate(self): 377 try: 378 self.debmirrorprocess.terminate() 379 return {'status':true,'msg':'debmirror stopped'} 380 except Exception as e: 381 return {'status':False,'msg':str(e)} 382 -
lliurex-mirror/trunk/fuentes/n4d-lliurex-mirror.install/usr/share/n4d/templates/lliurex-mirror/debmirror.conf
r1955 r2036 26 26 $remoteroot=""; 27 27 $download_method="http"; 28 @dists="{ { DISTRO }}";28 @dists="{% for distribution in DISTROS %}{{distribution}}{% if not loop.last %},{%endif%}{% endfor %}"; 29 29 @sections="{% for section in SECTIONS %}{{section}}{% if not loop.last %},{%endif%}{% endfor %}"; 30 30 @arches=({% for arch in ARCHITECTURES %}"{{arch}}"{% if not loop.last %},{%endif%}{% endfor %});
Note: See TracChangeset
for help on using the changeset viewer.