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 #8 from YunoHost-Apps/testing

Browse source 
Testing
This commit is contained in:
JimboJoe 2018-04-30 07:29:02 +02:00 committed by GitHub
commit 5e0c058e5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
check_process
View file

@ -11,6 +11,7 @@
setup_private=0 setup_private=0
setup_public=0 setup_public=0
upgrade=1 upgrade=1
upgrade=1 from_commit=a94b50de8b68501148fa90419ad3ea8e24c675e1
backup_restore=1 backup_restore=1
multi_instance=0 multi_instance=0
incorrect_path=1 incorrect_path=1
@ -31,3 +32,7 @@
;;; Options ;;; Options
Email= Email=
Notification=none Notification=none
;;; Upgrade options
; commit=a94b50de8b68501148fa90419ad3ea8e24c675e1
name=Refactoring
manifest_arg=domain=DOMAIN&path=PATH&

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