diff --git a/cfg/linse-rpi11.cfg b/cfg/linse-rpi11.cfg index 0228032..20de867 100644 --- a/cfg/linse-rpi11.cfg +++ b/cfg/linse-rpi11.cfg @@ -7,3 +7,11 @@ MAC=d8:3a:dd:51:29:32 [NETWORK] end0=wan enx00e04c680093=192.168.1.1 + +[FRAPPY] +prot=5000 +cfg=demo + +[BOXWEB] +port=8080 +page=dil5 diff --git a/install.py b/install.py index dd9914f..ca3627a 100755 --- a/install.py +++ b/install.py @@ -167,14 +167,13 @@ WantedBy = multi-user.target BOXWEB_SERVICE = """[Unit] Description = Web service for local GUI on a box -After = network.target +After = waitboot.target [Service] -Environment=PYTHONPATH=/home/l_samenv/.local/lib/python3.11/site-packages/ -ExecStart = /usr/bin/python3 /home/l_samenv/boxweb/flaskserver.py {page} {port} +ExecStart = /usr/bin/python /home/l_samenv/boxweb/flaskserver.py {page} {port} [Install] -WantedBy = multi-user.target +WantedBy = default.target """ pip_requirements = { @@ -277,7 +276,7 @@ def pip(): show.dirty = True -def boxweb(port=80, page=None): +def boxweb(port=8080, page=None): port = int(port) servicecfg = None if page is None else BOXWEB_SERVICE.format(port=port, page=page) return port <= 1024, servicecfg diff --git a/to_home/.bash_profile b/to_home/.bash_profile index c8b24f0..6701181 100644 --- a/to_home/.bash_profile +++ b/to_home/.bash_profile @@ -24,12 +24,3 @@ boxweb() { } . ~/.config/linse_profile - -if [[ "$(tty)" == "/dev/tty1" && -z "$(pgrep wayfire)" ]]; then - echo "desktop is not running, try to start it" - python ~/boxtools/wait_websocket.py - if [[ -z "$(pgrep wayfire)" ]]; then - echo "start desktop (wayfire)" - wayfire - fi -fi diff --git a/to_home/.config/systemd/user/boxweb-browser.service b/to_home/.config/systemd/user/boxweb-browser.service new file mode 100644 index 0000000..0b16624 --- /dev/null +++ b/to_home/.config/systemd/user/boxweb-browser.service @@ -0,0 +1,12 @@ +[Unit] +Description = Running Web Browser for boxweb +Requires=labwc.service +Requires=boxweb.service + +[Service] +Type=simple +ExecStart = /usr/bin/python /home/l_samenv/boxweb/start_browser.py + +[Install] +WantedBy = default.target + diff --git a/to_home/.config/systemd/user/labwc.service b/to_home/.config/systemd/user/labwc.service new file mode 100644 index 0000000..f8062d6 --- /dev/null +++ b/to_home/.config/systemd/user/labwc.service @@ -0,0 +1,11 @@ +[Unit] +Description=LabWC Wayland compositor +After=graphical.target + +[Service] +Type=simple +ExecStart=/usr/bin/labwc +Restart=on-failure + +[Install] +WantedBy=default.target