paramecio/pastafari2
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Fixes in updates

Browse source
This commit is contained in:
Antonio de la Rosa 2022-02-11 00:12:11 +01:00
parent 25d98341ac
commit 7a3fe536a8
7 changed files with 94 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/dashboard.py
View file

@ -451,7 +451,7 @@ def pastafari2_update_task():
task_id=0
path_task='modules.pastafari2.tasks.system.ping'
path_task='modules.pastafari2.tasks.system.updates'
data={}

24
scripts/system/install_git.py Normal file
View file

@ -0,0 +1,24 @@
#!/usr/bin/python3 -u
# A script for install pzoo user
from subprocess import call
from time import sleep
import distro
linux_distro=distro.id()
print('{"error": 0, "status": 0, "progress": 0, "no_progress":0, "message": "Installing git..."}')
sleep(1)
if linux_distro=='arch':
if call("sudo pacman -S --noconfirm git", shell=True) > 0:
print('Error, cannot install git...')
exit(1)
elif linux_distro=='debian':
if call('sudo DEBIAN_FRONTEND="noninteractive" apt-get install -y git', shell=True) > 0:
print('Error, cannot install git...')
exit(1)

6
scripts/system/install_psutil.sh
View file

@ -6,10 +6,8 @@ sleep 1
echo '{"error": 0, "status": 0, "progress": 100, "no_progress":0, "message": "Installing python3-psutil..."}'
sudo DEBIAN_FRONTEND="noninteractive" apt-get install -y python3-pip
#sudo pip3 install psutil
sudo apt-get install -y python3-psutil
sudo pip3 install psutil
#sudo apt-get install -y python3-psutil
#echo "Installed python3-psutil sucessfully if not error..."

25
scripts/system/install_python.sh
View file

@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
sleep 1
@ -16,7 +16,7 @@ if [[ $DISTRO =~ ^Debian ]]; then
elif [[ $DISTRO =~ ^NAME=\"Arch ]]; then
sudo pacman -S python python-pip
sudo pacman -S --noconfirm python python-pip
else
@ -40,5 +40,26 @@ else
fi
echo '{"error": 0, "status": 0, "progress": 0, "no_progress":0, "message": "Installing distro package for python and detect distribution..."}'
sleep 1
sudo pip3 install distro
if [ $? -eq 0 ]; then
#echo "Installed python3 sucessfully if not error..."
echo '{"error": 0, "status": 0, "progress": 100, "no_progress":0, "message": "Installed distro python package sucessfully..."}'
sleep 1
else
echo "Sorry, cannot install distro python package..."
exit 1;
fi
sleep 1

28
scripts/system/updates.py Normal file
View file

@ -0,0 +1,28 @@
#!/usr/bin/python3 -u
# A script for install pzoo user
from subprocess import call
from time import sleep
import distro
linux_distro=distro.id()
print('{"error": 0, "status": 0, "progress": 0, "no_progress":0, "message": "Upgrading server..."}')
sleep(1)
if linux_distro=='arch':
if call("sudo pacman -Syu --noconfirm", shell=True) > 0:
print('Error, cannot upgrade server...')
exit(1)
elif linux_distro=='debian':
if call('sudo DEBIAN_FRONTEND="noninteractive" apt-get -y update', shell=True) > 0:
print('Error, cannot upgrade server...')
exit(1)
if call('sudo DEBIAN_FRONTEND="noninteractive" apt-get -y upgrade', shell=True) > 0:
print('Error, cannot upgrade server...')
exit(1)

4
tasks/system/task.py
View file

@ -12,7 +12,7 @@ class ServerTask(Task):
self.files=[['modules/pastafari2/scripts/system/install_pzoo_stats.py', 0o755]]
self.files.append(['modules/pastafari2/scripts/system/install_python.sh', 0o755])
self.files.append(['modules/pastafari2/scripts/system/install_psutil.sh', 0o755])
self.files.append(['modules/pastafari2/scripts/system/install_git.sh', 0o755])
self.files.append(['modules/pastafari2/scripts/system/install_git.py', 0o755])
self.files.append(['modules/pastafari2/scripts/system/sudoers.d/spanel', 0o640])
self.files.append([self.data['pub_key'], 0o600])
@ -20,8 +20,8 @@ class ServerTask(Task):
self.commands_to_execute=[]
#self.commands_to_execute.append(['modules/pastafari2/scripts/system/alive.sh', ''])
self.commands_to_execute.append(['modules/pastafari2/scripts/system/install_git.sh', ''])
self.commands_to_execute.append(['modules/pastafari2/scripts/system/install_python.sh', ''])
self.commands_to_execute.append(['modules/pastafari2/scripts/system/install_git.py', ''])
self.commands_to_execute.append(['modules/pastafari2/scripts/system/install_psutil.sh', ''])
self.commands_to_execute.append(['modules/pastafari2/scripts/system/install_pzoo_stats.py', '--user='+self.data['ssh_user']+' --pub_key='+self.data['pub_key']+' --url_stats='+self.data['url_stats']+' --group='+self.data['group_name']])

14
tasks/system/updates.py Normal file
View file

@ -0,0 +1,14 @@
from modules.pastafari2.libraries.task import Task
from modules.pastafari2.models.pastafari2 import ServerDbTask
class ServerTask(Task):
def __init__(self, server, conn, remote_user='root', remote_password='', private_key='./ssh/id_rsa', password_key='', remote_path='pastafari2', task_id=0, data={}):
super().__init__(server, conn, remote_user, remote_password, private_key, password_key, remote_path, task_id, data)
self.files=[['modules/pastafari2/scripts/system/updates.py', 0o755]]
self.commands_to_execute=[]
self.commands_to_execute.append(['modules/pastafari2/scripts/system/updates.py', ''])