Compare commits

...

3 Commits

Author SHA1 Message Date
51c2de4a19 Removed trailing slash from config_example's base_url 2026-07-27 17:28:24 +03:00
923e05879d Added OpenSSL support 2026-07-23 16:25:59 +03:00
395ac4781a Fix specifying config filename 2026-07-16 16:17:59 +03:00
3 changed files with 7 additions and 7 deletions

View File

@@ -3,6 +3,6 @@ srcs += helpers.cpp
srcs += TRMNL.cpp
all:
g++ ${srcs} -o server
g++ ${srcs} -o server -lssl -lcrypto
.PHONY: all

View File

@@ -2,7 +2,7 @@
// Required
"host": "localhost",
"port": 0,
"base_url": "https://trmnl.com/",
"base_url": "https://trmnl.com",
// Optional
"devices_filename": "devices.json",

View File

@@ -17,6 +17,7 @@
#include <fcntl.h>
#include <sys/stat.h>
#define CPPHTTPLIB_OPENSSL_SUPPORT
#include "httplib.h"
#include "json.hpp"
@@ -205,7 +206,7 @@ int main(int argc, char **argv)
TRMNLContainer container;
shared_mutex mut_container;
if (argc > 2)
if (argc >= 2)
{
config_filename = argv[1];
}
@@ -223,9 +224,8 @@ int main(int argc, char **argv)
json_extract(cfg, "devices_filename", devices_filename);
json_extract(cfg, "folder_images", folder_images);
// TODO: Extract when SSL is ready
// json_extract(cfg, "cert_file", cert_file);
// json_extract(cfg, "key_file", cert_file);
json_extract(cfg, "cert_file", cert_file);
json_extract(cfg, "key_file", key_file);
json_extract(cfg, "refresh_min", refresh_min);
json_extract(cfg, "refresh_offset", refresh_offset);
@@ -262,7 +262,7 @@ int main(int argc, char **argv)
if (!cert_file.empty() && !key_file.empty())
{
// TODO: Implement SSL Server Properly
server = make_shared<httplib::SSLServer>(cert_file.c_str(), key_file.c_str());
}
else
{