Merge branch 'ent-13129-eliminar-del-script-de-instalacion-offline-el-antiguo-websocket-engine-y-modificar-contrasenas' into 'develop'
13129 remove websocket engine from online installer See merge request artica/pandorafms!7113
This commit is contained in:
commit
4b6fd8ef33
|
@ -528,23 +528,6 @@ ServerTokens Prod
|
||||||
|
|
||||||
EO_CONFIG_F
|
EO_CONFIG_F
|
||||||
|
|
||||||
# Add ws proxy options to apache.
|
|
||||||
cat >> /etc/httpd/conf.modules.d/00-proxy.conf << 'EO_HTTPD_MOD'
|
|
||||||
LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so
|
|
||||||
|
|
||||||
EO_HTTPD_MOD
|
|
||||||
|
|
||||||
cat >> /etc/httpd/conf.d/wstunnel.conf << 'EO_HTTPD_WSTUNNEL'
|
|
||||||
ProxyRequests Off
|
|
||||||
<Proxy *>
|
|
||||||
Require all granted
|
|
||||||
</Proxy>
|
|
||||||
|
|
||||||
ProxyPass /ws ws://127.0.0.1:8080
|
|
||||||
ProxyPassReverse /ws ws://127.0.0.1:8080
|
|
||||||
|
|
||||||
EO_HTTPD_WSTUNNEL
|
|
||||||
|
|
||||||
# Temporal quitar htaccess
|
# Temporal quitar htaccess
|
||||||
sed -i -e "s/php_flag engine off//g" $PANDORA_CONSOLE/images/.htaccess
|
sed -i -e "s/php_flag engine off//g" $PANDORA_CONSOLE/images/.htaccess
|
||||||
sed -i -e "s/php_flag engine off//g" $PANDORA_CONSOLE/attachment/.htaccess
|
sed -i -e "s/php_flag engine off//g" $PANDORA_CONSOLE/attachment/.htaccess
|
||||||
|
@ -691,16 +674,6 @@ EO_LRA
|
||||||
chmod 0644 /etc/logrotate.d/pandora_server
|
chmod 0644 /etc/logrotate.d/pandora_server
|
||||||
chmod 0644 /etc/logrotate.d/pandora_agent
|
chmod 0644 /etc/logrotate.d/pandora_agent
|
||||||
|
|
||||||
# Add websocket engine start script.
|
|
||||||
mv /var/www/html/pandora_console/pandora_websocket_engine /etc/init.d/
|
|
||||||
chmod +x /etc/init.d/pandora_websocket_engine
|
|
||||||
|
|
||||||
# Start Websocket engine
|
|
||||||
/etc/init.d/pandora_websocket_engine start &>> $LOGFILE
|
|
||||||
|
|
||||||
# Configure websocket to be started at start.
|
|
||||||
systemctl enable pandora_websocket_engine &>> $LOGFILE
|
|
||||||
|
|
||||||
# Enable pandora ha service
|
# Enable pandora ha service
|
||||||
systemctl enable pandora_server --now &>> $LOGFILE
|
systemctl enable pandora_server --now &>> $LOGFILE
|
||||||
execute_cmd "systemctl start pandora_server" "Starting Pandora FMS Server"
|
execute_cmd "systemctl start pandora_server" "Starting Pandora FMS Server"
|
||||||
|
|
|
@ -639,23 +639,6 @@ ServerTokens Prod
|
||||||
|
|
||||||
EO_CONFIG_F
|
EO_CONFIG_F
|
||||||
|
|
||||||
# Add ws proxy options to apache.
|
|
||||||
cat >> /etc/httpd/conf.modules.d/00-proxy.conf << 'EO_HTTPD_MOD'
|
|
||||||
LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so
|
|
||||||
|
|
||||||
EO_HTTPD_MOD
|
|
||||||
|
|
||||||
cat >> /etc/httpd/conf.d/wstunnel.conf << 'EO_HTTPD_WSTUNNEL'
|
|
||||||
ProxyRequests Off
|
|
||||||
<Proxy *>
|
|
||||||
Require all granted
|
|
||||||
</Proxy>
|
|
||||||
|
|
||||||
ProxyPass /ws ws://127.0.0.1:8080
|
|
||||||
ProxyPassReverse /ws ws://127.0.0.1:8080
|
|
||||||
|
|
||||||
EO_HTTPD_WSTUNNEL
|
|
||||||
|
|
||||||
# Temporal quitar htaccess
|
# Temporal quitar htaccess
|
||||||
sed -i -e "s/php_flag engine off//g" $PANDORA_CONSOLE/images/.htaccess
|
sed -i -e "s/php_flag engine off//g" $PANDORA_CONSOLE/images/.htaccess
|
||||||
sed -i -e "s/php_flag engine off//g" $PANDORA_CONSOLE/attachment/.htaccess
|
sed -i -e "s/php_flag engine off//g" $PANDORA_CONSOLE/attachment/.htaccess
|
||||||
|
@ -813,16 +796,6 @@ EO_LRA
|
||||||
chmod 0644 /etc/logrotate.d/pandora_server
|
chmod 0644 /etc/logrotate.d/pandora_server
|
||||||
chmod 0644 /etc/logrotate.d/pandora_agent
|
chmod 0644 /etc/logrotate.d/pandora_agent
|
||||||
|
|
||||||
# Add websocket engine start script.
|
|
||||||
mv /var/www/html/pandora_console/pandora_websocket_engine /etc/init.d/ &>> "$LOGFILE"
|
|
||||||
chmod +x /etc/init.d/pandora_websocket_engine &>> "$LOGFILE"
|
|
||||||
|
|
||||||
# Start Websocket engine
|
|
||||||
/etc/init.d/pandora_websocket_engine start &>> "$LOGFILE"
|
|
||||||
|
|
||||||
# Configure websocket to be started at start.
|
|
||||||
systemctl enable pandora_websocket_engine &>> "$LOGFILE"
|
|
||||||
|
|
||||||
# Enable pandora ha service
|
# Enable pandora ha service
|
||||||
systemctl enable pandora_server --now &>> "$LOGFILE"
|
systemctl enable pandora_server --now &>> "$LOGFILE"
|
||||||
execute_cmd "/etc/init.d/pandora_server start" "Starting Pandora FMS Server"
|
execute_cmd "/etc/init.d/pandora_server start" "Starting Pandora FMS Server"
|
||||||
|
|
|
@ -648,17 +648,6 @@ ServerTokens Prod
|
||||||
</Directory>
|
</Directory>
|
||||||
EO_CONFIG_F
|
EO_CONFIG_F
|
||||||
|
|
||||||
#Enable quickshell proxy
|
|
||||||
cat >> /etc/apache2/mods-enabled/00-proxy.conf << 'EO_HTTPD_WSTUNNEL'
|
|
||||||
ProxyRequests Off
|
|
||||||
<Proxy *>
|
|
||||||
Require all granted
|
|
||||||
</Proxy>
|
|
||||||
|
|
||||||
ProxyPass /ws ws://127.0.0.1:8080
|
|
||||||
ProxyPassReverse /ws ws://127.0.0.1:8080
|
|
||||||
EO_HTTPD_WSTUNNEL
|
|
||||||
|
|
||||||
# Fixing console permissions
|
# Fixing console permissions
|
||||||
chmod 600 $PANDORA_CONSOLE/include/config.php &>> "$LOGFILE"
|
chmod 600 $PANDORA_CONSOLE/include/config.php &>> "$LOGFILE"
|
||||||
chown -R www-data:www-data $PANDORA_CONSOLE &>> "$LOGFILE"
|
chown -R www-data:www-data $PANDORA_CONSOLE &>> "$LOGFILE"
|
||||||
|
@ -813,16 +802,6 @@ EO_LRA
|
||||||
chmod 0644 /etc/logrotate.d/pandora_server
|
chmod 0644 /etc/logrotate.d/pandora_server
|
||||||
chmod 0644 /etc/logrotate.d/pandora_agent
|
chmod 0644 /etc/logrotate.d/pandora_agent
|
||||||
|
|
||||||
# Add websocket engine start script.
|
|
||||||
mv /var/www/html/pandora_console/pandora_websocket_engine /etc/init.d/ &>> "$LOGFILE"
|
|
||||||
chmod +x /etc/init.d/pandora_websocket_engine &>> "$LOGFILE"
|
|
||||||
|
|
||||||
# Start Websocket engine
|
|
||||||
/etc/init.d/pandora_websocket_engine start &>> "$LOGFILE"
|
|
||||||
|
|
||||||
# Configure websocket to be started at start.
|
|
||||||
systemctl enable pandora_websocket_engine &>> "$LOGFILE"
|
|
||||||
|
|
||||||
# Enable pandora ha service
|
# Enable pandora ha service
|
||||||
execute_cmd "/etc/init.d/pandora_server start" "Starting Pandora FMS Server"
|
execute_cmd "/etc/init.d/pandora_server start" "Starting Pandora FMS Server"
|
||||||
systemctl enable pandora_server &>> "$LOGFILE"
|
systemctl enable pandora_server &>> "$LOGFILE"
|
||||||
|
|
Loading…
Reference in New Issue