From c20a0d5be68841355cf87a31a068d8d72f3ac9ea Mon Sep 17 00:00:00 2001 From: Justin Schneck Date: Tue, 27 Feb 2018 18:41:12 -0500 Subject: [PATCH] v1.0.0-rc.0 --- .circleci/config.yml | 7 +- CHANGELOG.md | 7 + VERSION | 2 +- example/config/config.exs | 4 +- example/lib/example/application.ex | 25 +++- example/mix.exs | 8 +- example/mix.lock.x86_64 | 10 +- mix.exs | 51 +++---- mix.lock | 8 +- nerves_defconfig | 2 +- rootfs_overlay/etc/erlinit.config | 2 +- rootfs_overlay/etc/qt-webengine-kiosk.ini | 166 +++++++++++++++------- 12 files changed, 186 insertions(+), 106 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f247342..ccf0973 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,12 +1,11 @@ defaults: &defaults working_directory: /nerves/build docker: - - image: nervesproject/nerves:0.17.0 + - image: nervesproject/nerves:1.0.0-rc.0 environment: ENV: CI MIX_ENV: test - MIX_TARGET: x86_64 - ELIXIR_VERSION: 1.5.2 + ELIXIR_VERSION: 1.6.1 install_elixir: &install_elixir run: @@ -20,7 +19,6 @@ install_hex_rebar: &install_hex_rebar run: name: Install hex and rebar command: | - cd /tmp mix local.hex --force mix local.rebar --force @@ -28,7 +26,6 @@ install_nerves_bootstrap: &install_nerves_bootstrap run: name: Install nerves_bootstrap command: | - cd /tmp mix archive.install github nerves-project/nerves_bootstrap --force version: 2.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ff24bd..8b2b611 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## v1.0.0-rc.0 + + * Updated Dependencies + * [nerves_system_br v1.0.0-rc.0](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.0.0-rc.0) + * [nerves_toolchain v1.0.0-rc.0](https://github.com/nerves-project/toolchains/releases/tag/v1.0.0-rc.0) + * [nerves v1.0.0-rc.0](https://github.com/nerves-project/nerves/releases/tag/v1.0.0-rc.0) + ## v0.6.0 * Updated Dependencies diff --git a/VERSION b/VERSION index a918a2a..49cd325 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.0 +1.0.0-rc.0 diff --git a/example/config/config.exs b/example/config/config.exs index ac0a795..f65aff8 100644 --- a/example/config/config.exs +++ b/example/config/config.exs @@ -25,10 +25,10 @@ config :nerves, :firmware, # Add the LoggerCircularBuffer backend. This removes the # default :console backend. -config :logger, backends: [LoggerCircularBuffer] +config :logger, backends: [RingLogger] # Set the number of messages to hold in the circular buffer -config :logger, LoggerCircularBuffer, buffer_size: 100 +config :logger, RingLogger, buffer_size: 100 network_ssid = System.get_env("NERVES_NETWORK_SSID") network_psk = System.get_env("NERVES_NETWORK_PSK") diff --git a/example/lib/example/application.ex b/example/lib/example/application.ex index 069bfc9..19d941e 100644 --- a/example/lib/example/application.ex +++ b/example/lib/example/application.ex @@ -7,11 +7,14 @@ defmodule Example.Application do import Supervisor.Spec, warn: false iface = Application.get_env(:nerves_network, :iface) init0() + # Comment if you need to wait for an IP before launching + init1(%{}) # Define workers and child supervisors to be supervised children = [ - worker(SystemRegistry.Task, [ - [:state, :network_interface, iface, :ipv4_address], - &init1/1]) + # Uncomment if you need to wait for IP + # worker(SystemRegistry.Task, [ + # [:state, :network_interface, iface, :ipv4_address], + # &init1/1]) ] # See http://elixir-lang.org/docs/stable/elixir/Supervisor.html @@ -61,7 +64,15 @@ defmodule Example.Application do def init_ui() do System.put_env("QTWEBENGINE_REMOTE_DEBUGGING", "9222") System.put_env("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-embedded-switches") - System.cmd("qt-webengine-kiosk", ["-c", "/etc/qt-webengine-kiosk.ini", "--opengl", "NATIVE"]) + start_remote_debugger() + # Need to spawn to make sure we don't block + # Otherwise, SystemRegistry will continue to send messages + # and run out of memory. + if pid = Process.whereis(QtWebEngineKiosk) do + Process.exit(pid, :normal) + end + spawn(fn -> MuonTrap.cmd("qt-webengine-kiosk", ["-c", "/etc/qt-webengine-kiosk.ini", "--opengl", "NATIVE"]) end) + |> Process.register(QtWebEngineKiosk) end def init_ntp(ntp_server) do @@ -75,6 +86,10 @@ defmodule Example.Application do end def start_remote_debugger() do - System.cmd("socat", ["tcp-listen:9223,fork", "tcp:localhost:9222"]) + if pid = Process.whereis(QtWebEngineRemoteDebugger) do + Process.exit(pid, :normal) + end + spawn(fn -> MuonTrap.cmd("socat",["tcp-listen:9223,fork", "tcp:localhost:9222"]) end) + |> Process.register(QtWebEngineRemoteDebugger) end end diff --git a/example/mix.exs b/example/mix.exs index c36cde1..0803446 100644 --- a/example/mix.exs +++ b/example/mix.exs @@ -1,6 +1,7 @@ defmodule Example.MixProject do use Mix.Project + System.put_env("MIX_TARGET", "x86_64") @target System.get_env("MIX_TARGET") || "host" def project do @@ -9,7 +10,7 @@ defmodule Example.MixProject do version: "0.1.0", elixir: "~> 1.4", target: @target, - archives: [nerves_bootstrap: "~> 0.8"], + archives: [nerves_bootstrap: "~> 1.0-rc"], deps_path: "deps/#{@target}", build_path: "_build/#{@target}", lockfile: "mix.lock.#{@target}", @@ -45,8 +46,8 @@ defmodule Example.MixProject do # Run "mix help deps" to learn about dependencies. defp deps do [ - {:nerves, "~> 0.10", runtime: false}, - {:logger_circular_buffer, "~> 0.2"} + {:nerves, "~> 1.0-rc", runtime: false}, + {:ring_logger, "~> 0.4"} ] ++ deps(@target) end @@ -59,6 +60,7 @@ defmodule Example.MixProject do {:nerves_runtime, "~> 0.4"}, {:nerves_network, "~> 0.3"}, {:nerves_init_gadget, "~> 0.1"}, + {:muontrap, "~> 0.2"} ] ++ system(target) end diff --git a/example/mix.lock.x86_64 b/example/mix.lock.x86_64 index 6950810..295f7b5 100644 --- a/example/mix.lock.x86_64 +++ b/example/mix.lock.x86_64 @@ -4,17 +4,19 @@ "elixir_make": {:hex, :elixir_make, "0.4.0", "992f38fabe705bb45821a728f20914c554b276838433349d4f2341f7a687cddf", [:mix], [], "hexpm"}, "logger_circular_buffer": {:hex, :logger_circular_buffer, "0.2.0", "fd3dfd4720ef9e26a20e1d405d4bfbd6b88507e2fb0cccbe00a1fff38862e5ca", [:mix], [], "hexpm"}, "mdns": {:hex, :mdns, "0.1.7", "7b949773ff5809bb720256171767db1c9bf21eea477128b361a92b0c5e6af220", [:mix], [{:dns, "~> 1.0", [hex: :dns, repo: "hexpm", optional: false]}], "hexpm"}, - "nerves": {:hex, :nerves, "0.10.0", "8558b661f92acb1c01689bb1b750362c58733ac4305aa305ce418b2ed2af3f20", [:mix], [{:distillery, "~> 1.4", [hex: :distillery, repo: "hexpm", optional: false]}], "hexpm"}, + "muontrap": {:hex, :muontrap, "0.2.1", "ecf61fd9265c186f8f8fe6014aa054c61e1fc36ed3f7ab9db35a9d13ee808d5a", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"}, + "nerves": {:hex, :nerves, "1.0.0-rc.0", "5c6cf122611d0024d06b88593aa9af46180d30712fc6ff07fa25fb9100125f1e", [:mix], [{:distillery, "~> 1.4", [hex: :distillery, repo: "hexpm", optional: false]}], "hexpm"}, "nerves_firmware_ssh": {:hex, :nerves_firmware_ssh, "0.3.1", "e8b1967fa0aff255230be539c68ec868d33884193a385caff957ebad7d6aa8af", [:mix], [{:nerves_runtime, "~> 0.4", [hex: :nerves_runtime, repo: "hexpm", optional: false]}], "hexpm"}, "nerves_init_gadget": {:hex, :nerves_init_gadget, "0.2.1", "20f36dd062fb00e2be8817ddff1b9ced9762877cfe23f6ec1d5936a37e3fc2c8", [:mix], [{:mdns, "~> 0.1", [hex: :mdns, repo: "hexpm", optional: false]}, {:nerves_firmware_ssh, "~> 0.2", [hex: :nerves_firmware_ssh, repo: "hexpm", optional: false]}, {:nerves_network, "~> 0.3", [hex: :nerves_network, repo: "hexpm", optional: false]}, {:nerves_runtime, "~> 0.3", [hex: :nerves_runtime, repo: "hexpm", optional: false]}], "hexpm"}, "nerves_network": {:hex, :nerves_network, "0.3.6", "c95779283ace071e9d12882d6a80e31edc8c476012adc61aba2ff6c306ef97b3", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:nerves_network_interface, "~> 0.4.0", [hex: :nerves_network_interface, repo: "hexpm", optional: false]}, {:nerves_wpa_supplicant, "~> 0.3.0", [hex: :nerves_wpa_supplicant, repo: "hexpm", optional: false]}, {:system_registry, "~> 0.4", [hex: :system_registry, repo: "hexpm", optional: false]}], "hexpm"}, "nerves_network_interface": {:hex, :nerves_network_interface, "0.4.4", "200b1a84bc1a7fdeaf3a1e0e2d4e9b33e240b034e73f39372768d43f8690bae0", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"}, "nerves_runtime": {:hex, :nerves_runtime, "0.5.3", "7447a3e718762f3901046f72cc824e528f8d0565a581b8ae58f4f5b6436bca7f", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:system_registry, "~> 0.5", [hex: :system_registry, repo: "hexpm", optional: false]}], "hexpm"}, - "nerves_system_br": {:hex, :nerves_system_br, "0.17.0", "f7c0d1b6b11e9a1c187b17f2401a00956bebd5c45946bfe2a332ad26ecbf18f9", [:mix], [], "hexpm"}, + "nerves_system_br": {:hex, :nerves_system_br, "1.0.0-rc.0", "63400e1a12baa307603d9d0b30fe87de1f67623f71156b278f0be5ce74c7d117", [:mix], [], "hexpm"}, "nerves_system_linter": {:hex, :nerves_system_linter, "0.3.0", "84e0f63c8ac196b16b77608bbe7df66dcf352845c4e4fb394bffd2b572025413", [:mix], [], "hexpm"}, - "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.3.1", "add96a4b12da4b50fdc5cf18517989de37cf3b329d7edf258ec794878ba06e89", [:mix], [{:nerves, "~> 0.9", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm"}, - "nerves_toolchain_x86_64_unknown_linux_gnu": {:hex, :nerves_toolchain_x86_64_unknown_linux_gnu, "0.13.1", "41979823c60bbc6808f40ab61048ccab48a432b5ff268f1c87f9e1edd9621fd9", [:mix], [{:nerves, "~> 0.9", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.3", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm"}, + "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.4.0-rc.0", "1766752c2a854af5e0f102892d947f787f8f47ee500f564e7fdb50c4d1c4789c", [:mix], [{:nerves, "~> 1.0-rc", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm"}, + "nerves_toolchain_x86_64_unknown_linux_gnu": {:hex, :nerves_toolchain_x86_64_unknown_linux_gnu, "1.0.0-rc.0", "885b813d416ca9428b81def8a45c6abdb16618ec3a87351f7964e297064d2f7d", [:mix], [{:nerves, "~> 1.0-rc", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.4-rc", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm"}, "nerves_wpa_supplicant": {:hex, :nerves_wpa_supplicant, "0.3.2", "19dc7e1248336e7f542b11b2b857ceb5b088d3eb41a6ca75b7b76628dcf67aad", [:make, :mix], [{:elixir_make, "~> 0.3", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"}, + "ring_logger": {:hex, :ring_logger, "0.4.0", "d58b2d9be6350d291fde90c734dcd56cb50b9be7cae4868163088db84a499e92", [:mix], [], "hexpm"}, "shoehorn": {:hex, :shoehorn, "0.2.0", "6aa80804145c545c59af01980d255209483b14826f53411b4a8797b24c323c20", [:mix], [{:distillery, "~> 1.0", [hex: :distillery, repo: "hexpm", optional: false]}], "hexpm"}, "socket": {:hex, :socket, "0.3.13", "98a2ab20ce17f95fb512c5cadddba32b57273e0d2dba2d2e5f976c5969d0c632", [:mix], [], "hexpm"}, "system_registry": {:hex, :system_registry, "0.7.0", "cd3aaf2c15392fa60f93869dde49f536fcf60e54f3b15db737e7d4ebcac108f4", [:mix], [], "hexpm"}, diff --git a/mix.exs b/mix.exs index 2b87f31..6fdae55 100644 --- a/mix.exs +++ b/mix.exs @@ -1,10 +1,3 @@ -if Mix.env == :test do - hash = :os.cmd('git rev-parse HEAD') - |> to_string - |> String.trim - System.put_env("NERVES_FW_VCS_IDENTIFIER", hash) -end - defmodule KioskSystemx8664.Mixfile do use Mix.Project @@ -36,17 +29,16 @@ defmodule KioskSystemx8664.Mixfile do ] end - # Starting nerves_bootstrap adds the required aliases to Mix.Project.config() - # Aliases are only added if MIX_TARGET is set. - def bootstrap(args) do - Application.start(:nerves_bootstrap) - Mix.Task.run("loadconfig", args) - end - def application do [] end + defp bootstrap(args) do + System.put_env("MIX_TARGET", "x86_64") + Application.start(:nerves_bootstrap) + Mix.Task.run("loadconfig", args) + end + defp nerves_package do [ type: :system, @@ -64,9 +56,9 @@ defmodule KioskSystemx8664.Mixfile do defp deps do [ - {:nerves, "~> 0.10", runtime: false}, - {:nerves_system_br, "~> 0.17.0", runtime: false, app: false}, - {:nerves_toolchain_x86_64_unknown_linux_gnu , "~> 0.13.1", runtime: false}, + {:nerves, "~> 1.0-rc", runtime: false}, + {:nerves_system_br, "~> 1.0-rc", runtime: false}, + {:nerves_toolchain_x86_64_unknown_linux_gnu , "~> 1.0-rc", runtime: false}, {:nerves_system_linter, "~> 0.3.0", runtime: false} ] end @@ -88,24 +80,25 @@ defmodule KioskSystemx8664.Mixfile do defp package_files do [ - "LICENSE", - "mix.exs", - "nerves_defconfig", - "README.md", - "VERSION", + "package", + "patches", + "priv", "rootfs_overlay", - "fwup.conf", + "CHANGELOG.md", + "Config.in", + "external.mk", "fwup-revert.conf", + "fwup.conf", "grub.cfg", + "LICENSE", "linux-4.13.defconfig", - "post-createfs.sh", + "mix.exs", + "nerves_defconfig", "post-build.sh", - "Config.in", - "external.mk", - "package", + "post-createfs.sh", + "README.md", "users_table.txt", - "priv", - "patches" + "VERSION" ] end end diff --git a/mix.lock b/mix.lock index 4268ae2..629531d 100644 --- a/mix.lock +++ b/mix.lock @@ -1,9 +1,9 @@ %{ "distillery": {:hex, :distillery, "1.5.2", "eec18b2d37b55b0bcb670cf2bcf64228ed38ce8b046bb30a9b636a6f5a4c0080", [:mix], [], "hexpm"}, - "nerves": {:hex, :nerves, "0.10.0", "8558b661f92acb1c01689bb1b750362c58733ac4305aa305ce418b2ed2af3f20", [:mix], [{:distillery, "~> 1.4", [hex: :distillery, repo: "hexpm", optional: false]}], "hexpm"}, - "nerves_system_br": {:hex, :nerves_system_br, "0.17.0", "f7c0d1b6b11e9a1c187b17f2401a00956bebd5c45946bfe2a332ad26ecbf18f9", [:mix], [], "hexpm"}, + "nerves": {:hex, :nerves, "1.0.0-rc.0", "5c6cf122611d0024d06b88593aa9af46180d30712fc6ff07fa25fb9100125f1e", [:mix], [{:distillery, "~> 1.4", [hex: :distillery, repo: "hexpm", optional: false]}], "hexpm"}, + "nerves_system_br": {:hex, :nerves_system_br, "1.0.0-rc.0", "63400e1a12baa307603d9d0b30fe87de1f67623f71156b278f0be5ce74c7d117", [:mix], [], "hexpm"}, "nerves_system_linter": {:hex, :nerves_system_linter, "0.3.0", "84e0f63c8ac196b16b77608bbe7df66dcf352845c4e4fb394bffd2b572025413", [:mix], [], "hexpm"}, - "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.3.1", "add96a4b12da4b50fdc5cf18517989de37cf3b329d7edf258ec794878ba06e89", [:mix], [{:nerves, "~> 0.9", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm"}, - "nerves_toolchain_x86_64_unknown_linux_gnu": {:hex, :nerves_toolchain_x86_64_unknown_linux_gnu, "0.13.1", "41979823c60bbc6808f40ab61048ccab48a432b5ff268f1c87f9e1edd9621fd9", [:mix], [{:nerves, "~> 0.9", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.3", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm"}, + "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.4.0-rc.0", "1766752c2a854af5e0f102892d947f787f8f47ee500f564e7fdb50c4d1c4789c", [:mix], [{:nerves, "~> 1.0-rc", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm"}, + "nerves_toolchain_x86_64_unknown_linux_gnu": {:hex, :nerves_toolchain_x86_64_unknown_linux_gnu, "1.0.0-rc.0", "885b813d416ca9428b81def8a45c6abdb16618ec3a87351f7964e297064d2f7d", [:mix], [{:nerves, "~> 1.0-rc", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.4-rc", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm"}, "nerves_toolchain_x86_64_unknown_linux_musl": {:hex, :nerves_toolchain_x86_64_unknown_linux_musl, "0.11.0", "15adde7a5df1d35d0f3f9c46cc3784c2d5e4f2b3a5bff7023f33b7799ddef997", [:mix], [{:nerves, "~> 0.7", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.1", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm"}, } diff --git a/nerves_defconfig b/nerves_defconfig index 70f352f..2a43bf0 100644 --- a/nerves_defconfig +++ b/nerves_defconfig @@ -2,7 +2,7 @@ BR2_x86_64=y BR2_GLOBAL_PATCH_DIR="${BR2_EXTERNAL_NERVES_PATH}/patches ${NERVES_DEFCONFIG_DIR}/patches" BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v0.13.1/nerves_toolchain_x86_64_unknown_linux_gnu-linux_x86_64-0.13.1-84C2F9843BFD6792AAD3F14436F084A1D0953AF88525684D326A1FC20C5E0B20.tar.xz" +BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v1.0.0-rc.0/nerves_toolchain_x86_64_unknown_linux_gnu-linux_x86_64-1.0.0-rc.0-7328AFD.tar.xz" BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-unknown-linux-gnu" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y diff --git a/rootfs_overlay/etc/erlinit.config b/rootfs_overlay/etc/erlinit.config index 178d7af..536aaa7 100644 --- a/rootfs_overlay/etc/erlinit.config +++ b/rootfs_overlay/etc/erlinit.config @@ -35,7 +35,7 @@ -e LANG=en_US.UTF-8;LANGUAGE=en;ERL_INETRC=/etc/erl_inetrc;ERL_CRASH_DUMP=/root/crash.dump # Mount the application partition --m /dev/rootdisk3:/root:ext4:: +-m /dev/rootdisk0p4:/root:ext4:: # Erlang release search path -r /srv/erlang diff --git a/rootfs_overlay/etc/qt-webengine-kiosk.ini b/rootfs_overlay/etc/qt-webengine-kiosk.ini index 94ab07f..f345f41 100644 --- a/rootfs_overlay/etc/qt-webengine-kiosk.ini +++ b/rootfs_overlay/etc/qt-webengine-kiosk.ini @@ -1,84 +1,148 @@ -[application] -icon=/usr/share/icons/qt-webkit-kiosk.png -name=QtWebkitKiosk -organization=Organization -organization-domain=www.example.com -version=1.99.3 +[browser] +; Full URI or full path to HTML file +;homepage=http://www.example.com/ +homepage=http://127.0.0.1:4000/ -[attach] -javascripts= -styles= +; Delay load homepage on startup +startup_load_delayed=true +; Delay in msec +startup_load_delay=100 -[browser] +; When you enable the cookiejar your cookies will be remembered between runs. +; When you disable the cookiejar your cookies will disappear when you quit the program. cookiejar=false -disable_hotkeys=true -homepage=file:///var/www/index.html -ignore_ssl_errors=false + java=false javascript=true +; handle window.open? +; catch link and follow. no new windows. +javascript_can_open_windows=true +; handle window.close ? javascript_can_close_windows=false -javascript_can_open_windows=false +webgl=false plugins=true +; Trust any certificate by default +ignore_ssl_errors=true +; Don't close application, show default homepage. Used with javascript window.close() show_homepage_on_window_close=true -startup_load_delay=100 -startup_load_delayed=true -webgl=true -[cache] -clear-on-exit=false -clear-on-start=false -enable=false -location=/root/.cache/qt-webkit-kiosk/QtWebkitKiosk -size=10000000 +; Disable reaction on keyboard +disable_hotkeys=false -[event-sounds] +[signals] enable=true -link-clicked=/usr/share/qt-webkit-kiosk/window-clicked.ogg -window-clicked=/usr/share/qt-webkit-kiosk/window-clicked.ogg + +; Warning! +; Some signals dont' exists on some systems... +; Windows - SIGUSR1, SIGUSR1 + +; Empty by default +; SIGUSR1 - reload config and load homepage URI +; If set - try to load defined URI +SIGUSR1= +; SIGUSR2 - load homepage URI from current config +; If set - try to load defined URI +SIGUSR2= + +[rpc] +; @TODO +; May be JSON-RPC +enable=false +; Do not forget to allow access in your firewall +listen=127.0.0.1:9000 [inspector] +; Call web-inspector by F12 enable=false +; Visible on browser start visible=false +[attach] +; Attach files content then page loaded. Styles goes first +; Define each file full path and split with comma +styles= +javascripts= + +[event-sounds] +enable=false +; full-path to sound file +; format - supported by Qt or system +; Sound for click anywhere in window +;window-clicked=window-clicked.wav +; Sound for click on a link +;link-clicked=link-clicked.wav + +[cache] +enable=true +; Full path to cache directory +location=/root/cache +; Max cache size in bytes +size=100000000 +; cache clean up +clean-on-start=false +clean-on-exit=false + +[application] +; Used in User-Agent header +organization=LeTote +organization-domain=dc.letote.com +name=LTNervesKiosk +version=1.99.3 + [printing] enable=false -page_margin_bottom=5 -page_margin_left=5 -page_margin_right=5 -page_margin_top=5 -printer=default show-printer-dialog=false +printer=default +page_margin_left=0 +page_margin_top=0 +page_margin_right=0 +page_margin_bottom=0 [proxy] -auth=false enable=false +system=true host=proxy.example.com -password=password port=3128 -system=true +auth=false username=username - -[signals] -SIGUSR1= -SIGUSR2= -enable=true +password=password [view] -disable_selection=true -fixed-centered=true -fixed-height=600 +fullscreen=true +maximized=false fixed-size=false fixed-width=800 +fixed-height=600 +fixed-centered=true +; if not centered fixed-x=0 fixed-y=0 -fullscreen=true -hide_mouse_cursor=true + +; Another window manager hint to prevent showing other windows or taskbar +stay_on_top=false + +;; Minimum window size, default - 320x200 +;minimum-width=320 +;minimum-height=200 + +; Try to avoid some bogus Windows behaviour when taskbar become visible after window fullscreened... +startup_resize_delayed=true +; Delay in msec +startup_resize_delay=200 + +; Try to hide window scrollbars for any content overflow. Scrolling works only with keyboard keys. If they not disabled. hide_scrollbars=true -maximized=true -minimal-height=600 -minimal-width=800 -page_scale=1 + +; Try to hide selection +disable_selection=true + +; Show progress bar at page top then web-page loading show_load_progress=true -startup_resize_delay=200 -startup_resize_delayed=false -stay_on_top=false + +; Page scale factor +page_scale=1.0 + +; If you use this program without a mouse it can be nice to hide the mouse. +; This does not disable the mouse itself: you can still interact with websites +; using the mouse, you just won't be able to see the mouse pointer. +hide_mouse_cursor=false