Compare commits

..

No commits in common. "2a4652bd5503fd5c4fa6e5e56e330fc46d903f6a" and "949471915cde479e81d022f1091f83b749b108dc" have entirely different histories.

2 changed files with 6 additions and 16 deletions

View File

@ -1,3 +1,2 @@
*/5 * * * * root /usr/sbin/libreschool-client */5 * * * * root /usr/sbin/libreschool-client
* */1 * * * root /usr/sbin/libreschool-client --with-inventory
@reboot root /usr/sbin/libreschool-client @reboot root /usr/sbin/libreschool-client

View File

@ -10,7 +10,6 @@ import sys
import socket import socket
import fileinput import fileinput
import json import json
import commands
def get_default_gateway_linux(): def get_default_gateway_linux():
"""Read the default gateway directly from /proc.""" """Read the default gateway directly from /proc."""
@ -28,15 +27,15 @@ def update_config_file(config):
config.write(configfile) config.write(configfile)
def set_new_hostname(hostname, domainname, oldhostname): def set_new_hostname(hostname, domainname, oldhostname):
if os.path.isfile('/etc/hosts'):
f1=open('/etc/hosts','r').read()
m1=f1.replace(oldhostname,hostname)
m2=m1.replace(oldhostname+'.'+domainname, hostname+'.'+domainname)
f2=open('/etc/hosts','w')
f2.write(m2)
os.system("hostname -b "+hostname) os.system("hostname -b "+hostname)
with open('/etc/hostname', 'w') as hostnamefile: with open('/etc/hostname', 'w') as hostnamefile:
hostnamefile.write(hostname) hostnamefile.write(hostname)
if not os.path.isfile('/etc/hosts'):
f1=open('/etc/hosts','r').read()
m=f1.replace(oldhostname,hostname)
m=m.replace(oldhostname+'.'+domainname, hostname+'.'+domainname)
f2=open('/etc/hosts','w')
f2.write(m)
return return
config = configparser.ConfigParser() config = configparser.ConfigParser()
@ -75,14 +74,6 @@ data = {
'last_config': config['server'].get('last_config','0') 'last_config': config['server'].get('last_config','0')
} }
if '--with-inventory' in sys.argv:
_, cpu = commands.getstatusoutput('cat /proc/cpuinfo | grep \'^model\ name\' | head -n 1 | sed \'s/model\\ name\\s:\\s*\\(.*\\)/\\1/\'')
_, ram = commands.getstatusoutput('vmstat -s | grep \'total memory$\' | awk \'{print $1}\'')
_, distro = commands.getstatusoutput('lsb_release -d')
data['cpu'] = cpu
data['ram'] = ram
data['distro'] = distro
# if server uuid is set # if server uuid is set
if 'uuid' in config['server']: if 'uuid' in config['server']:
# and is in the correct format # and is in the correct format