Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

keep sunshine config in .config folder #117

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

keep sunshine config in .config folder #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions images/sunshine/configs/sunshine.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ min_log_level = info
# origin_pin_allowed = lan

# The file where current state of Sunshine is stored
file_state = /home/retro/sunshine_state.json
file_state = /home/retro/.config/sunshine/sunshine_state.json

# The display modes advertised by Sunshine
#
Expand All @@ -61,7 +61,7 @@ file_state = /home/retro/sunshine_state.json
# ping_timeout = 2000

# The file where configuration for the different applications that Sunshine can run during a stream
file_apps = /home/retro/sunshine/apps.json
file_apps = /home/retro/.config/sunshine/apps.json

# How much error correcting packets must be send for every video
# This is just some random number, don't know the optimal value
Expand Down
11 changes: 6 additions & 5 deletions images/sunshine/scripts/startup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ gow_log "Waiting for X Server $DISPLAY to be available"
LOG_LEVEL=${LOG_LEVEL:-INFO}
gow_log "Starting sunshine with DISPLAY=${DISPLAY} and LOG_LEVEL=${LOG_LEVEL}"

mkdir -p "$HOME/sunshine/" "$HOME/.config/sunshine/"
cp -u /cfg/sunshine.conf "$HOME/sunshine/sunshine.conf"
cp -u /cfg/apps.json "$HOME/sunshine/apps.json"
mkdir -p "$HOME/.config/sunshine/"
cp -n /cfg/sunshine.conf "$HOME/.config/sunshine/sunshine.conf"
cp -n /cfg/sunshine.conf "$HOME/.config/sunshine/sunshine.conf.sample"
cp -n /cfg/apps.json "$HOME/.config/sunshine/apps.json"

## Pass sunshine credentials via ENV
sunshine "${HOME}/sunshine/sunshine.conf" --creds "${SUNSHINE_USER:-admin}" "${SUNSHINE_PASS:-admin}"
sunshine "${HOME}/.config/sunshine/sunshine.conf" --creds "${SUNSHINE_USER:-admin}" "${SUNSHINE_PASS:-admin}"

# Start Sunshine
exec sunshine min_log_level="$LOG_LEVEL" "${HOME}/sunshine/sunshine.conf"
exec sunshine min_log_level="$LOG_LEVEL" "${HOME}/.config/sunshine/sunshine.conf"