Skip to content

Commit

Permalink
fix: get back ph_ prefix for ph.conf keys
Browse files Browse the repository at this point in the history
  • Loading branch information
@anibalportero
anibalportero committed Jun 3, 2024
1 parent e1bb992 commit 498ee2c
Showing 1 changed file with 34 additions and 47 deletions.
81 changes: 34 additions & 47 deletions config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,26 @@ struct pv_config_entry {

// configuration lookup table
static struct pv_config_entry entries[] = {
{ STR, "PH_CREDS_HOST", PH_ENTRY, 0, .value.s = CREDS_HOST_DEF },
{ STR, "PH_CREDS_ID", PH_ENTRY, 0, .value.s = NULL },
{ INT, "PH_CREDS_PORT", PH_ENTRY, 0, .value.i = 12365 },
{ STR, "PH_CREDS_PROXY_HOST", PH_ENTRY | UPDATE_TIME, 0,
.value.s = NULL },
{ INT, "PH_CREDS_PROXY_NOPROXYCONNECT", PH_ENTRY | UPDATE_TIME, 0,
.value.i = 0 },
{ INT, "PH_CREDS_PROXY_PORT", PH_ENTRY | UPDATE_TIME, 0,
.value.i = 3218 },
{ STR, "PH_CREDS_PRN", PH_ENTRY, 0, .value.s = NULL },
{ STR, "PH_CREDS_SECRET", PH_ENTRY, 0, .value.s = NULL },
{ STR, "PH_CREDS_TYPE", PH_ENTRY, 0, .value.s = CREDS_TYPE_DEF },
{ STR, "PH_FACTORY_AUTOTOK", PH_ENTRY, 0, .value.s = NULL },
{ INT, "PH_METADATA_DEVMETA_INTERVAL", PH_ENTRY | RUN_TIME, 0,
.value.i = 10 },
{ INT, "PH_METADATA_USRMETA_INTERVAL", PH_ENTRY | RUN_TIME, 0,
.value.i = 5 },
{ INT, "PH_UPDATER_INTERVAL", PH_ENTRY | RUN_TIME, 0, .value.i = 60 },
{ INT, "PH_UPDATER_NETWORK_TIMEOUT", PH_ENTRY | RUN_TIME, 0,
.value.i = 120 },
{ STR, "PV_BOOTLOADER_FITCONFIG", PV_ENTRY | POLICY, 0,
.value.s = NULL },
{ STR, "PV_BOOTLOADER_MTD_ENV", PV_ENTRY | POLICY, 0, .value.s = NULL },
Expand All @@ -133,20 +153,6 @@ static struct pv_config_entry entries[] = {
{ BOOL, "PV_CONTROL_REMOTE", PV_ENTRY | POLICY, 0, .value.b = true },
{ BOOL, "PV_CONTROL_REMOTE_ALWAYS", PV_ENTRY | POLICY, 0,
.value.b = false },
{ STR, "PV_CREDS_HOST", PH_ENTRY, 0, .value.s = CREDS_HOST_DEF },
{ STR, "PV_CREDS_ID", PH_ENTRY, 0, .value.s = NULL },
{ INT, "PV_CREDS_PORT", PH_ENTRY, 0, .value.i = 12365 },
{ STR, "PV_CREDS_PROXY_HOST", PH_ENTRY | UPDATE_TIME, 0,
.value.s = NULL },
{ INT, "PV_CREDS_PROXY_NOPROXYCONNECT", PH_ENTRY | UPDATE_TIME, 0,
.value.i = 0 },
{ INT, "PV_CREDS_PROXY_PORT", PH_ENTRY | UPDATE_TIME, 0,
.value.i = 3218 },
{ STR, "PV_CREDS_PRN", PH_ENTRY, 0, .value.s = NULL },
{ STR, "PV_CREDS_SECRET", PH_ENTRY, 0, .value.s = NULL },
{ STR, "PV_CREDS_TPM_CERT", PH_ENTRY, 0, .value.s = NULL },
{ STR, "PV_CREDS_TPM_KEY", PH_ENTRY, 0, .value.s = NULL },
{ STR, "PV_CREDS_TYPE", PH_ENTRY, 0, .value.s = CREDS_TYPE_DEF },
{ BOOL, "PV_DEBUG_SHELL", PV_ENTRY | POLICY, 0, .value.b = true },
{ BOOL, "PV_DEBUG_SHELL_AUTOLOGIN", PV_ENTRY | POLICY, 0,
.value.b = false },
Expand All @@ -161,7 +167,6 @@ static struct pv_config_entry entries[] = {
.value.s = DISK_WRITABLEDIR_DEF },
{ STR, "PV_DROPBEAR_CACHE_DIR", PV_ENTRY | POLICY, 0,
.value.s = DROPBEAR_CACHE_DIR_DEF },
{ STR, "PV_FACTORY_AUTOTOK", PH_ENTRY, 0, .value.s = NULL },
{ STR, "PV_LIBTHTTP_CERTSDIR", PV_ENTRY | POLICY, 0,
.value.s = LIBTHTTP_CERTSDIR_DEF },
{ INT, "PV_LIBTHTTP_LOG_LEVEL", PV_ENTRY | RUN_TIME, 0, .value.i = 3 },
Expand All @@ -182,14 +187,9 @@ static struct pv_config_entry entries[] = {
.value.i = LOG_SERVER_OUTPUT_FILE_TREE | LOG_SERVER_OUTPUT_UPDATE },
{ STR, "PV_LOG_SINGLEFILE_TIMESTAMP_FORMAT", PV_ENTRY | RUN_TIME, 0,
.value.s = NULL },
{ BOOL, "PV_LOG_STDOUT", PV_ENTRY | RUN_TIME, 0, .value.b = false },
{ STR, "PV_LOG_STDOUT_TIMESTAMP_FORMAT", PV_ENTRY | RUN_TIME, 0,
.value.s = NULL },
{ INT, "PV_LXC_LOG_LEVEL", PV_ENTRY | UPDATE_TIME, 0, .value.i = 2 },
{ INT, "PV_METADATA_DEVMETA_INTERVAL", PH_ENTRY | RUN_TIME, 0,
.value.i = 10 },
{ INT, "PV_METADATA_USRMETA_INTERVAL", PH_ENTRY | RUN_TIME, 0,
.value.i = 5 },
{ STR, "PV_NET_BRADDRESS4", PV_ENTRY | UPDATE_TIME, 0,
.value.s = NET_BRADDRESS4_DEF },
{ STR, "PV_NET_BRDEV", PV_ENTRY | UPDATE_TIME, 0,
Expand All @@ -198,8 +198,6 @@ static struct pv_config_entry entries[] = {
.value.s = NET_BRMASK4_DEF },
{ STR, "PV_POLICY", PV_ENTRY, 0, .value.s = NULL },
{ INT, "PV_REVISION_RETRIES", PV_ENTRY | RUN_TIME, 0, .value.i = 10 },
{ INT, "PV_REVISION_RETRIES_TIMEOUT", PV_ENTRY | RUN_TIME, 0,
.value.i = 120 },
{ BOOL, "PV_SECUREBOOT_CHECKSUM", PV_ENTRY | POLICY, 0,
.value.b = true },
{ BOOL, "PV_SECUREBOOT_HANDLERS", PV_ENTRY | POLICY, 0,
Expand All @@ -221,7 +219,6 @@ static struct pv_config_entry entries[] = {
.value.s = NULL },
{ STR, "PV_STORAGE_MNTPOINT", PV_ENTRY | POLICY, 0, .value.s = NULL },
{ STR, "PV_STORAGE_MNTTYPE", PV_ENTRY | POLICY, 0, .value.s = NULL },
{ STR, "PV_STORAGE_OPTS", PV_ENTRY | POLICY, 0, .value.s = NULL },
{ INT, "PV_STORAGE_WAIT", PV_ENTRY | POLICY, 0, .value.i = 5 },
{ STR, "PV_SYSTEM_APPARMOR_PROFILES", PV_ENTRY | POLICY, 0,
.value.s = NULL },
Expand All @@ -247,12 +244,8 @@ static struct pv_config_entry entries[] = {
.value.i = 25 },
{ INT, "PV_UPDATER_GOALS_TIMEOUT", PV_ENTRY | RUN_TIME, 0,
.value.i = 120 },
{ INT, "PV_UPDATER_INTERVAL", PH_ENTRY | RUN_TIME, 0, .value.i = 60 },
{ INT, "PV_UPDATER_NETWORK_TIMEOUT", PH_ENTRY | RUN_TIME, 0,
.value.i = 120 },
{ BOOL, "PV_UPDATER_USE_TMP_OBJECTS", PV_ENTRY | RUN_TIME, 0,
.value.b = false },
{ BOOL, "PV_WDT_ENABLED", PV_ENTRY | UPDATE_TIME, 0, .value.b = true },
{ WDT_MODE, "PV_WDT_MODE", PV_ENTRY | UPDATE_TIME, 0,
.value.i = WDT_SHUTDOWN },
{ INT, "PV_WDT_TIMEOUT", PV_ENTRY | UPDATE_TIME, 0, .value.i = 15 }
Expand All @@ -265,6 +258,20 @@ struct pv_config_alias {

static struct pv_config_alias aliases[] = {
// LEGACY CONFIG KEY
{ "creds.host", "PH_CREDS_HOST" },
{ "creds.id", "PH_CREDS_ID" },
{ "creds.port", "PH_CREDS_PORT" },
{ "creds.proxy.host", "PH_CREDS_PROXY_HOST" },
{ "creds.proxy.noproxyconnect", "PH_CREDS_PROXY_NOPROXYCONNECT" },
{ "creds.proxy.port", "PH_CREDS_PROXY_PORT" },
{ "creds.prn", "PH_CREDS_PRN" },
{ "creds.secret", "PH_CREDS_SECRET" },
{ "creds.type", "PH_CREDS_TYPE" },
{ "factory.autotok", "PH_FACTORY_AUTOTOK" },
{ "metadata.devmeta.interval", "PH_METADATA_DEVMETA_INTERVAL" },
{ "metadata.usrmeta.interval", "PH_METADATA_USRMETA_INTERVAL" },
{ "updater.interval", "PH_UPDATER_INTERVAL" },
{ "updater.network_timeout", "PH_UPDATER_NETWORK_TIMEOUT" },
{ "bootloader.fitconfig", "PV_BOOTLOADER_FITCONFIG" },
{ "bootloader.mtd_env", "PV_BOOTLOADER_MTD_ENV" },
{ "bootloader.mtd_only", "PV_BOOTLOADER_MTD_ONLY" },
Expand All @@ -273,17 +280,6 @@ static struct pv_config_alias aliases[] = {
{ "cache.usrmetadir", "PV_CACHE_USRMETADIR" },
{ "control.remote", "PV_CONTROL_REMOTE" },
{ "control.remote.always", "PV_CONTROL_REMOTE_ALWAYS" },
{ "creds.host", "PV_CREDS_HOST" },
{ "creds.id", "PV_CREDS_ID" },
{ "creds.port", "PV_CREDS_PORT" },
{ "creds.proxy.host", "PV_CREDS_PROXY_HOST" },
{ "creds.proxy.noproxyconnect", "PV_CREDS_PROXY_NOPROXYCONNECT" },
{ "creds.proxy.port", "PV_CREDS_PROXY_PORT" },
{ "creds.prn", "PV_CREDS_PRN" },
{ "creds.secret", "PV_CREDS_SECRET" },
{ "creds.tpm.cert", "PV_CREDS_TPM_CERT" },
{ "creds.tpm.key", "PV_CREDS_TPM_KEY" },
{ "creds.type", "PV_CREDS_TYPE" },
{ "debug.shell", "PV_DEBUG_SHELL" },
{ "debug.shell.autologin", "PV_DEBUG_SHELL_AUTOLOGIN" },
{ "debug.ssh", "PV_DEBUG_SSH" },
Expand All @@ -292,7 +288,6 @@ static struct pv_config_alias aliases[] = {
{ "disk.voldir", "PV_DISK_VOLDIR" },
{ "disk.writabledir", "PV_DISK_WRITABLEDIR" },
{ "dropbear.cache.dir", "PV_DROPBEAR_CACHE_DIR" },
{ "factory.autotok", "PV_FACTORY_AUTOTOK" },
{ "libthttp.certdir", "PV_LIBTHTTP_CERTSDIR" },
{ "libthttp.log.level", "PV_LIBTHTTP_LOG_LEVEL" },
{ "log.capture", "PV_LOG_CAPTURE" },
Expand All @@ -307,17 +302,13 @@ static struct pv_config_alias aliases[] = {
{ "log.server.outputs", "PV_LOG_SERVER_OUTPUTS" },
{ "log.singlefile.timestamp.format",
"PV_LOG_SINGLEFILE_TIMESTAMP_FORMAT" },
{ "log.stdout", "PV_LOG_STDOUT" },
{ "log.stdout.timestamp.format", "PV_LOG_STDOUT_TIMESTAMP_FORMAT" },
{ "lxc.log.level", "PV_LXC_LOG_LEVEL" },
{ "metadata.devmeta.interval", "PV_METADATA_DEVMETA_INTERVAL" },
{ "metadata.usrmeta.interval", "PV_METADATA_USRMETA_INTERVAL" },
{ "net.braddress4", "PV_NET_BRADDRESS4" },
{ "net.brdev", "PV_NET_BRDEV" },
{ "net.brmask4", "PV_NET_BRMASK4" },
{ "policy", "PV_POLICY" },
{ "revision.retries", "PV_REVISION_RETRIES" },
{ "revision.retries.timeout", "PV_REVISION_RETRIES_TIMEOUT" },
{ "secureboot.checksum", "PV_SECUREBOOT_CHECKSUM" },
{ "secureboot.handlers", "PV_SECUREBOOT_HANDLERS" },
{ "secureboot.mode", "PV_SECUREBOOT_MODE" },
Expand All @@ -332,7 +323,6 @@ static struct pv_config_alias aliases[] = {
{ "storage.logtempsize", "PV_STORAGE_LOGTEMPSIZE" },
{ "storage.mntpoint", "PV_STORAGE_MNTPOINT" },
{ "storage.mnttype", "PV_STORAGE_MNTTYPE" },
{ "storage.opts", "PV_STORAGE_OPTS" },
{ "storage.wait", "PV_STORAGE_WAIT" },
{ "system.apparmor.profiles", "PV_SYSTEM_APPARMOR_PROFILES" },
{ "system.confdir", "PV_SYSTEM_CONFDIR" },
Expand All @@ -347,10 +337,7 @@ static struct pv_config_alias aliases[] = {
{ "system.usrdir", "PV_SYSTEM_USRDIR" },
{ "updater.commit.delay", "PV_UPDATER_COMMIT_DELAY" },
{ "updater.goals.timeout", "PV_UPDATER_GOALS_TIMEOUT" },
{ "updater.interval", "PV_UPDATER_INTERVAL" },
{ "updater.network_timeout", "PV_UPDATER_NETWORK_TIMEOUT" },
{ "updater.use_tmp_objects", "PV_UPDATER_USE_TMP_OBJECTS" },
{ "wdt.enabled", "PV_WDT_ENABLED" },
{ "wdt.mode", "PV_WDT_MODE" },
{ "wdt.timeout", "PV_WDT_TIMEOUT" },
// OTHER COMPATIBLE KEYS
Expand Down

0 comments on commit 498ee2c

Please sign in to comment.