aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-connectivity/gateone/gateone
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-connectivity/gateone/gateone')
-rw-r--r--meta-oe/recipes-connectivity/gateone/gateone/0001-configuration.py-Hack-around-broken-gethostname-thin.patch26
-rw-r--r--meta-oe/recipes-connectivity/gateone/gateone/80oe.conf23
-rw-r--r--meta-oe/recipes-connectivity/gateone/gateone/gateone.service2
-rw-r--r--meta-oe/recipes-connectivity/gateone/gateone/server.conf5
4 files changed, 50 insertions, 6 deletions
diff --git a/meta-oe/recipes-connectivity/gateone/gateone/0001-configuration.py-Hack-around-broken-gethostname-thin.patch b/meta-oe/recipes-connectivity/gateone/gateone/0001-configuration.py-Hack-around-broken-gethostname-thin.patch
new file mode 100644
index 0000000000..5f5fa9117e
--- /dev/null
+++ b/meta-oe/recipes-connectivity/gateone/gateone/0001-configuration.py-Hack-around-broken-gethostname-thin.patch
@@ -0,0 +1,26 @@
+From d811d3bdf06d78c93c48bef762c19c392c879077 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Tue, 26 Nov 2013 15:54:10 +0100
+Subject: [PATCH] configuration.py: Hack around broken gethostname thingy
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ gateone/core/configuration.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gateone/core/configuration.py b/gateone/core/configuration.py
+index da41cbd..d1c8222 100644
+--- a/gateone/core/configuration.py
++++ b/gateone/core/configuration.py
+@@ -162,7 +162,7 @@ def define_options(installed=True):
+ ]
+ # Used both http and https above to demonstrate that both are acceptable
+ try:
+- additional_origins = socket.gethostbyname_ex(socket.gethostname())
++ additional_origins = [] # additional_origins = socket.gethostbyname_ex(socket.gethostname())
+ except socket.gaierror:
+ # Couldn't get any IPs from the hostname
+ additional_origins = []
+--
+1.8.4.2
+
diff --git a/meta-oe/recipes-connectivity/gateone/gateone/80oe.conf b/meta-oe/recipes-connectivity/gateone/gateone/80oe.conf
new file mode 100644
index 0000000000..cde98bc10d
--- /dev/null
+++ b/meta-oe/recipes-connectivity/gateone/gateone/80oe.conf
@@ -0,0 +1,23 @@
+// Some custom Gate One settings for OpenEmbedded
+{
+ "*": {
+ "gateone": { // These settings apply to all of Gate One
+ "log_file_max_size": 5242880, // 5 megabyte logs for OE by default (default would normally be 100Mb)
+ "log_file_num_backups": 2, // Default is normally 10
+ "origins": ["*"], // Every device has a unique origin
+ "logging": "info",
+ "pid_file": "/var/run/gateone.pid",
+ "session_dir": "/tmp/gateone",
+ "user_dir": "/var/lib/gateone/users"
+ },
+ "terminal": {
+ // Disabling session logging for embedded devices is a good idea (limited/slow storage)
+ "session_logging": false,
+ "syslog_session_logging": false
+// "commands": {
+// // For some reason this doesn't work (never asks for the password)
+// "login": "setsid /bin/login" // Normally this would emulate logging into the host console
+// }
+ }
+ }
+}
diff --git a/meta-oe/recipes-connectivity/gateone/gateone/gateone.service b/meta-oe/recipes-connectivity/gateone/gateone/gateone.service
index 7ff60020a0..7b14d3e6de 100644
--- a/meta-oe/recipes-connectivity/gateone/gateone/gateone.service
+++ b/meta-oe/recipes-connectivity/gateone/gateone/gateone.service
@@ -4,7 +4,7 @@ ConditionPathExists=|/var/lib/gateone
[Service]
WorkingDirectory=/var/lib/gateone
-ExecStart=/usr/bin/python gateone.py
+ExecStart=/usr/bin/python /usr/bin/gateone
[Install]
WantedBy=multi-user.target
diff --git a/meta-oe/recipes-connectivity/gateone/gateone/server.conf b/meta-oe/recipes-connectivity/gateone/gateone/server.conf
deleted file mode 100644
index 988b0d085b..0000000000
--- a/meta-oe/recipes-connectivity/gateone/gateone/server.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-session_logging = False
-origins = "*"
-command = "/var/lib/gateone/plugins/ssh/scripts/ssh_connect.py -S '/tmp/gateone/%SESSION%/%SHORT_SOCKET%' --sshfp -a '-oUserKnownHostsFile=%USERDIR%/%USER%/ssh/known_hosts'"
-log_file_prefix = "/var/log/gateone.log"
-