Fix in install
This commit is contained in:
parent
50204461ee
commit
b6f1ae56bf
2 changed files with 7 additions and 15 deletions
|
|
@ -80,7 +80,7 @@ def options_options(row_id, row):
|
||||||
#arr_options=['<a href="{}">{}</a>'.format(url_for('admin_app.virtualhost', dbservermariadb_id=row_id), _('Websites'))]
|
#arr_options=['<a href="{}">{}</a>'.format(url_for('admin_app.virtualhost', dbservermariadb_id=row_id), _('Websites'))]
|
||||||
#
|
#
|
||||||
#arr_options.append('<a href="{}">{}</a>'.format(url_for('admin_app.ports', dbservermariadb_id=row_id), I18n.lang('dbservermariadb', 'http_ports', 'HTTP Ports')))
|
#arr_options.append('<a href="{}">{}</a>'.format(url_for('admin_app.ports', dbservermariadb_id=row_id), I18n.lang('dbservermariadb', 'http_ports', 'HTTP Ports')))
|
||||||
arr_options.append('<a href="{}">{}</a>'.format("", _('Edit')))
|
arr_options.append('<a href="{}">{}</a>'.format(url_for('php_app.php_edit_server', php_server_id=row_id), _('Edit')))
|
||||||
arr_options.append('<a href="{}">{}</a>'.format(url_for('php_app.delete_php', php_server_id=row_id), _('Delete')))
|
arr_options.append('<a href="{}">{}</a>'.format(url_for('php_app.delete_php', php_server_id=row_id), _('Delete')))
|
||||||
|
|
||||||
return '<br />'.join(arr_options)
|
return '<br />'.join(arr_options)
|
||||||
|
|
@ -90,7 +90,7 @@ def delete_php(php_server_id):
|
||||||
|
|
||||||
db=g.connection
|
db=g.connection
|
||||||
|
|
||||||
with db.query('select serverdbtask.hostname, phpserver.version from serverdbtask, phpserver where phpserver.server_id=serverdbtask.id') as cursor:
|
with db.query('select serverdbtask.hostname, phpserver.version from serverdbtask, phpserver where phpserver.server_id=serverdbtask.id and phpserver.id=%s', [php_server_id]) as cursor:
|
||||||
arr_server=cursor.fetchone()
|
arr_server=cursor.fetchone()
|
||||||
|
|
||||||
if arr_server:
|
if arr_server:
|
||||||
|
|
@ -155,3 +155,8 @@ def php_progress(php_server_id):
|
||||||
|
|
||||||
return load_progress(db, t, return_tree=return_tree, path_module='php_app.php_dashboard')
|
return load_progress(db, t, return_tree=return_tree, path_module='php_app.php_dashboard')
|
||||||
|
|
||||||
|
@php_app.route('/phpserver/edit_server/<int:php_server_id>/')
|
||||||
|
def php_edit_server(php_server_id):
|
||||||
|
|
||||||
|
return ""
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -62,16 +62,3 @@ install_php['rocky']=install_php['fedora']
|
||||||
linux.json_log('Install php {}...'.format(version), error=0, status=0, progress=0, no_progress=1);
|
linux.json_log('Install php {}...'.format(version), error=0, status=0, progress=0, no_progress=1);
|
||||||
|
|
||||||
linux.exec(install_php)
|
linux.exec(install_php)
|
||||||
|
|
||||||
#sed_php={'debian' : ['ServerTokens OS', "ServerTokens Prod", '\/etc\/apache2\/conf-enabled\/security.conf']}
|
|
||||||
|
|
||||||
"""
|
|
||||||
debian_package='apache2 logrotate socat curl'
|
|
||||||
|
|
||||||
redhat_package='httpd mod_ssl mod_md openssl tar socat policycoreutils-python-utils wget'
|
|
||||||
|
|
||||||
linux_package={'debian' : debian_package, 'ubuntu' : debian_package, 'fedora' : redhat_package, 'almalinux' : redhat_package, 'rocky' : redhat_package, 'arch' : 'apache'}
|
|
||||||
|
|
||||||
linux.install_package(linux_package);
|
|
||||||
|
|
||||||
"""
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue