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

Fixes in scripts

Browse source
This commit is contained in:
Antonio de la Rosa 2024-02-09 19:44:08 +01:00
parent ce92428dea
commit c7d3f1b1ad
7 changed files with 53 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tasks/apache/apache/install_apache.py
View file

@ -10,7 +10,9 @@ from modules.pastafari2.models.tasks import ResultTask
from modules.pastafari2.models.pastafari2 import ServerDbTask
from modules.apache.models.webservers import WebServer
from settings import config
from modules.pastafari2.libraries.configtask import config_task
import json
from paramecio2.libraries.urls import make_media_url, make_url
class ServerTask(Task):
@ -26,7 +28,7 @@ class ServerTask(Task):
#['modules/webservers/scripts/install_quota_home.py', 0o700],
self.files=[['modules/apache/scripts/install_apache.php', 0o700]]
self.files=[['modules/apache/scripts/install_apache.py', 0o700]]
#self.commands_to_execute=[]
@ -38,7 +40,7 @@ class ServerTask(Task):
#--mysql_server={} --mysql_db={} --mysql_user={} --mysql_pass={}'.format(mysql_server, mysql_db, config.webserver_user_db, config.webserver_user_pass)
self.commands_to_execute=[['php modules/apache/scripts/install_apache.php', '']]
self.commands_to_execute=[['/home/{}/pythonenv/bin/python3 -u modules/apache/scripts/install_apache.py'.format(config_task.remote_user), '']]
#self.commands_to_execute.append(['modules/webservers/scripts/install_quota_home.py', '', 'sudo'])
@ -52,6 +54,9 @@ class ServerTask(Task):
self.version='1.0'
self.path_module='admin_app.webservers'
self.links='<p><a href="{}">{}</a></p>'.format(make_url('webservers/servers'), _('Webservers list'))
def post_task(self):

2
tasks/apache/scripts/delete_app.py
View file

@ -39,7 +39,7 @@ class ServerTask(WebAppTask):
self.delete_directories=['modules/apache/scripts']
self.path_module='admin_app.webservers'
self.path_module='admin_app.apache'
self.links='<p><a href="{}">{}</a> &gt;&gt; <a href="{}">{}</a> &gt;&gt; <a href="{}">{}</a>'.format(make_url('webservers/servers'), I18n.lang('webservers', 'webservers_list', 'Webservers list'), make_url('webservers/virtualhost/'+str(self.webserver_id)), I18n.lang('webservers', 'websites', 'Websites'), make_url('webapps/'+str(self.data['virtualhost_id'])), I18n.lang('webservers', 'webapps', 'Webapps'))

2
tasks/apache/scripts/wordpress.py
View file

@ -156,7 +156,7 @@ class ServerTask(WebAppTask):
install_wordpress='--home_user=%s --user=%s --password="%s" --email=%s --domain=%s --title="%s" --db_mysql=%s --user_mysql=%s --password_mysql="%s" --server_mysql="%s" --port_mysql=%i --path=%s --php_version=%s' % (self.data['home'], self.data['user_wp'], self.data['password_wp'], self.data['email_wp'], self.data['domain_wp'], self.data['title_wp'], self.data['mysql_db'], self.data['mysql_user'], self.data['mysql_password'], self.data['mysql_host'], 3306, self.data['path'], arr_virtualhost['php'])
print(install_wordpress)
#print(install_wordpress)
self.commands_to_execute.append(['modules/apache/scripts/webapps/wordpress/install_wordpress_site.py', install_wordpress])