diff --git a/common/pkg/config/config_darwin.go b/common/pkg/config/config_darwin.go index 5283665e17..13bd3a3769 100644 --- a/common/pkg/config/config_darwin.go +++ b/common/pkg/config/config_darwin.go @@ -10,6 +10,10 @@ const ( // DefaultContainersConfig holds the default containers config path DefaultContainersConfig = "/usr/share/" + _configPath + + // DefaultSignaturePolicyPath is the default value for the + // policy.json file. + DefaultSignaturePolicyPath = "/etc/containers/policy.json" ) // podman remote clients on darwin cannot use unshare.isRootless() to determine the configuration file locations. diff --git a/common/pkg/config/config_freebsd.go b/common/pkg/config/config_freebsd.go index d698123566..903f0b47ce 100644 --- a/common/pkg/config/config_freebsd.go +++ b/common/pkg/config/config_freebsd.go @@ -10,6 +10,10 @@ const ( // DefaultContainersConfig holds the default containers config path DefaultContainersConfig = "/usr/local/share/" + _configPath + + // DefaultSignaturePolicyPath is the default value for the + // policy.json file. + DefaultSignaturePolicyPath = "/usr/local/etc/containers/policy.json" ) // podman remote clients on freebsd cannot use unshare.isRootless() to determine the configuration file locations. diff --git a/common/pkg/config/config_linux.go b/common/pkg/config/config_linux.go index 0f622bb787..4ce5d03209 100644 --- a/common/pkg/config/config_linux.go +++ b/common/pkg/config/config_linux.go @@ -13,6 +13,10 @@ const ( // DefaultContainersConfig holds the default containers config path DefaultContainersConfig = "/usr/share/" + _configPath + + // DefaultSignaturePolicyPath is the default value for the + // policy.json file. + DefaultSignaturePolicyPath = "/etc/containers/policy.json" ) func selinuxEnabled() bool { diff --git a/common/pkg/config/config_windows.go b/common/pkg/config/config_windows.go index 6c9d58485c..b5838072eb 100644 --- a/common/pkg/config/config_windows.go +++ b/common/pkg/config/config_windows.go @@ -8,6 +8,10 @@ const ( // DefaultContainersConfig holds the default containers config path DefaultContainersConfig = "/usr/share/" + _configPath + + // DefaultSignaturePolicyPath is the default value for the + // policy.json file. + DefaultSignaturePolicyPath = "/etc/containers/policy.json" ) // podman remote clients on windows cannot use unshare.isRootless() to determine the configuration file locations. diff --git a/common/pkg/config/default.go b/common/pkg/config/default.go index d15fa01fd3..5f083156b6 100644 --- a/common/pkg/config/default.go +++ b/common/pkg/config/default.go @@ -149,9 +149,6 @@ const ( DefaultPidsLimit = 2048 // DefaultPullPolicy pulls the image if it does not exist locally. DefaultPullPolicy = "missing" - // DefaultSignaturePolicyPath is the default value for the - // policy.json file. - DefaultSignaturePolicyPath = "/etc/containers/policy.json" // DefaultSubnet is the subnet that will be used for the default // network. DefaultSubnet = "10.88.0.0/16"