Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ func agentConfig() *Config {
},
AllowedDirectories: []string{
"/etc/nginx/", "/etc/nginx-agent/", "/usr/local/etc/nginx/", "/var/run/nginx/", "/var/log/nginx/",
"/usr/share/nginx/modules/",
"/usr/share/nginx/modules/", "/etc/app_protect/",
},
Collector: &Collector{
ConfigPath: "/etc/nginx-agent/nginx-agent-otelcol.yaml",
Expand Down
1 change: 1 addition & 0 deletions internal/config/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ func DefaultAllowedDirectories() []string {
"/usr/share/nginx/modules",
"/var/run/nginx",
"/var/log/nginx",
"/etc/app_protect",
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ func TestNginxAppProtectInstanceWatcher_Watch(t *testing.T) {
t.Fatalf("Timed out waiting for instance updates")
}
})

t.Run("Test 2: Update instance", func(t *testing.T) {
_, err = enforcerEngineVersionFile.WriteAt([]byte("6.113.0"), 0)
require.NoError(t, err)
Expand Down
1 change: 1 addition & 0 deletions nginx-agent.conf
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ log:

allowed_directories:
- /etc/nginx
- /etc/app_protect
- /usr/local/etc/nginx
- /usr/share/nginx/modules
- /var/run/nginx
Expand Down
1 change: 1 addition & 0 deletions scripts/packages/preinstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ labels:
allowed_directories="${allowed_directories}\n - ${config_dir}"
done
allowed_directories="${allowed_directories}\n - /var/log/nginx"
allowed_directories="${allowed_directories}\n - /etc/app_protect"

echo "Writing new v3 configuration to $v3_config_file"
v3_config_contents="
Expand Down
3 changes: 2 additions & 1 deletion scripts/packages/upgrade-agent-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ for config_dir in $config_dirs; do
done

allowed_directories="${allowed_directories}\n - /var/log/nginx"

allowed_directories="${allowed_directories}\n - /etc/app_protect"

v3_config_contents="
#
# /etc/nginx-agent/nginx-agent.conf
Expand Down