Fixes in scripts

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

View file

@ -17,34 +17,24 @@ linux.install_package(linux_package);
linux.json_log('Create directories for Apache manager...', error=0, status=0, progress=0, no_progress=1);
create_dirs={'debian' : {"sudo mkdir -p /etc/apache2/vhosts.d/ && sudo mkdir -p /etc/apache2/vhosts.d/{php,extra/proxyphp,extra/proxy}"}};
create_dirs={'debian' : "sudo mkdir -p /etc/apache2/vhosts.d/ && sudo mkdir -p /etc/apache2/vhosts.d/php && sudo mkdir -p /etc/apache2/vhosts.d/extra/proxyphp && sudo mkdir -p /etc/apache2/vhosts.d/extra/proxy"};
create_dirs['ubuntu']=create_dirs['debian'];
create_dirs['fedora']=["sudo mkdir -p /etc/httpd/vhosts.d/{php,extra/proxyphp,extra/proxy} "];
create_dirs['fedora']="sudo mkdir -p /etc/httpd/vhosts.d/php && sudo mkdir -p /etc/httpd/vhosts.d/extra/proxyphp && sudo mkdir -p /etc/httpd/vhosts.d/extra/proxy";
create_dirs['almalinux']=create_dirs['fedora'];
create_dirs['rocky']=create_dirs['fedora'];
create_dirs['arch']=create_dirs['fedora']
linux.exec(create_dirs);
#if(!file_put_contents('vhosts.conf', conf_vhosts)) {
with open('vhosts.conf', 'w') as f:
f.write(conf_vhosts)
# linux.json_log('Error: cannot create vhosts.conf', error=1, status=1, progress=100, no_progress=0);
# exit(1);
#}
try:
with fopen('vhosts.conf', 'w') as f:
f.write(conf_vhosts)
except:
linux.json_log('Error: cannot create vhosts.conf', error=1, status=1, progress=100, no_progress=0);
exit(1)
create_vhost_file={'debian' : ["sudo mv vhosts.conf /etc/apache2/sites-enabled/ && sudo chown root:root /etc/apache2/sites-enabled/vhosts.conf"]};
create_vhost_file={'debian' : "sudo mv vhosts.conf /etc/apache2/sites-enabled/ && sudo chown root:root /etc/apache2/sites-enabled/vhosts.conf"};
create_vhost_file['ubuntu']=create_vhost_file['debian'];
@ -52,24 +42,28 @@ create_vhost_file['ubuntu']=create_vhost_file['debian'];
#create_vhost_file['fedora']=["sudo mv vhosts.conf /etc/httpd/conf.d/zzz-vhosts.conf && sudo chown root:root /etc/httpd/conf.d/zzz-vhosts.conf && sudo chmod 644 /etc/httpd/conf.d/zzz-vhosts.conf"];
create_vhost_file['fedora']=["echo {conf_vhosts} | sudo tee -a /etc/httpd/conf/httpd.conf"];
create_vhost_file['fedora']="echo {} | sudo tee -a /etc/httpd/conf/httpd.conf".format(conf_vhosts)
create_vhost_file['almalinux']=create_vhost_file['fedora'];
create_vhost_file['rocky']=create_vhost_file['fedora'];
create_vhost_file['arch']=create_vhost_file['fedora'];
linux.exec(create_vhost_file);
#Modifying apache configuration
linux.json_log('Modifying Apache configuration...', error=0, status=0, progress=0, no_progress=1);
if linux_distro=='ubuntu' or linux_distro=='debian':
if linux_distro=='ubuntu' or linux_distro=='debian' or linux_distro=='arch':
sed_apache={'debian' : ['ServerTokens OS', "ServerTokens Prod", '/etc/apache2/conf-enabled/security.conf']}
sed_apache={'debian' : ['ServerTokens OS', "ServerTokens Prod", '\/etc\/apache2\/conf-enabled\/security.conf']}
sed_apache['ubuntu']=sed_apache['debian'];
sed_apache['arch']=['ServerTokens Full', 'ServerTokens Prod', '\/etc\/httpd\/conf\/extra\/httpd-default.conf']
linux.sed(sed_apache)
# In red hat derivatives is different.
@ -79,7 +73,7 @@ if linux_distro=='rocky' or linux_distro=='almalinux' or linux_distro=='fedora':
#echo 'deb blah ... blah' | sudo tee -a /etc/apt/sources.list
add_tokens={}
add_tokens['rocky']=["sudo echo \"ServerTokens Prod\" | sudo tee -a /etc/httpd/conf.d/tokens.conf"]
add_tokens['rocky']="sudo echo \"ServerTokens Prod\" | sudo tee -a /etc/httpd/conf.d/tokens.conf"
add_tokens['almalinux']=add_tokens['rocky']
@ -92,19 +86,40 @@ if linux_distro=='rocky' or linux_distro=='almalinux' or linux_distro=='fedora':
if linux_distro=='ubuntu' or linux_distro=='debian':
activate_modules={'debian' : ["sudo a2enmod ssl rewrite proxy proxy_fcgi headers"]}
activate_modules={'debian' : "sudo a2enmod ssl rewrite proxy proxy_fcgi headers"}
activate_modules['ubuntu']=create_vhost_file['debian'];
linux.exec(activate_modules)
# #LoadModule proxy_module modules/mod_proxy.so
#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so
if linux_distro=='arch':
load_proxy={}
load_proxy['arch']=['#LoadModule proxy_module modules\/mod_proxy.so', "LoadModule proxy_module modules\/mod_proxy.so", '/etc/httpd/conf/httpd.conf']
linux.sed(load_proxy)
load_proxy_fcgi={'arch': ['#LoadModule proxy_fcgi_module modules\/mod_proxy_fcgi.so', "LoadModule proxy_fcgi_module modules\/mod_proxy_fcgi.so", '/etc/httpd/conf/httpd.conf']}
linux.sed(load_proxy_fcgi)
#Options Indexes FollowSymLinks
quit_indexes={'arch': ['Options Indexes FollowSymLinks', 'Options FollowSymLinks', '/etc/httpd/conf/httpd.conf']}
linux.sed(quit_indexes)
if linux_distro=='rocky' or linux_distro=='almalinux' or linux_distro=='fedora':
if linux.shell_command('sudo systemctl status firewalld', 0)==0:
if linux.shell_command('sudo systemctl status firewalld'):
linux.shell_command("sudo firewall-cmd --add-service=http && sudo firewall-cmd --add-service=http --permanent && sudo firewall-cmd --add-service=https && sudo firewall-cmd --add-service=https --permanent")
else:
print('Not firewalld detected...')
#Restart apache