YunoHost-Apps/shellinabox_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/shellinabox_ynh.git synced 2024-09-03 20:26:12 +02:00
Code Issues Activity Actions

Merge pull request #6 from YunoHost-Apps/stretch_fix

Browse source 
Stretch fix
This commit is contained in:
JimboJoe 2018-04-20 12:34:56 +02:00 committed by GitHub
commit 4835fa411d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
conf/nginx.conf
View file

@ -10,6 +10,9 @@ location __PATH__ {
tcp_nodelay on; tcp_nodelay on;
access_log off; access_log off;
# Allow shellinabox to use 'eval' without blocking the execution. But keep a warning.
add_header Content-Security-Policy-Report-Only "script-src https: 'unsafe-eval'";
# Include SSOWAT user panel. # Include SSOWAT user panel.
include conf.d/yunohost_panel.conf.inc; include conf.d/yunohost_panel.conf.inc;
more_clear_input_headers 'Accept-Encoding'; more_clear_input_headers 'Accept-Encoding';

2
conf/shellinabox
View file

@ -15,4 +15,4 @@ SHELLINABOX_PORT=__PORT__
# #
# Beeps are disabled because of reports of the VLC plugin crashing # Beeps are disabled because of reports of the VLC plugin crashing
# Firefox on Linux/x86_64. # Firefox on Linux/x86_64.
SHELLINABOX_ARGS="--no-beep --localhost-only" SHELLINABOX_ARGS="--no-beep --localhost-only --disable-ssl"

5
scripts/install
View file

@ -75,6 +75,11 @@ ynh_add_nginx_config
cp ../conf/shellinabox /etc/default/shellinabox cp ../conf/shellinabox /etc/default/shellinabox
ynh_replace_string "__PORT__" "$port" "/etc/default/shellinabox" ynh_replace_string "__PORT__" "$port" "/etc/default/shellinabox"
# Allow the service to log in syslog
ynh_replace_string " -- -q --background" " -- --background" "/etc/init.d/shellinabox"
systemctl daemon-reload
systemctl restart shellinabox systemctl restart shellinabox
#================================================= #=================================================

5
scripts/restore
View file

@ -53,6 +53,11 @@ ynh_package_install shellinabox
ynh_restore_file "/etc/shellinabox" ynh_restore_file "/etc/shellinabox"
ynh_restore_file "/etc/default/shellinabox" ynh_restore_file "/etc/default/shellinabox"
# Allow the service to log in syslog
ynh_replace_string " -- -q --background" " -- --background" "/etc/init.d/shellinabox"
systemctl daemon-reload
systemctl restart shellinabox systemctl restart shellinabox
#================================================= #=================================================

9
scripts/upgrade
View file

@ -59,3 +59,12 @@ ynh_add_nginx_config
#================================================= #=================================================
systemctl reload nginx systemctl reload nginx
#=================================================
# ALLOW THE SERVICE TO LOG IN SYSLOG
#=================================================
ynh_replace_string " -- -q --background" " -- --background" "/etc/init.d/shellinabox"
systemctl daemon-reload
systemctl restart shellinabox