Browse Source

console_config.yaml -> console.yaml (#1195)

mmetc 3 năm trước cách đây
mục cha
commit
8310c10ce3
7 tập tin đã thay đổi với 7 bổ sung7 xóa
  1. 1 1
      config/config.yaml
  2. 0 0
      config/console.yaml
  3. 1 1
      debian/rules
  4. 1 1
      pkg/csconfig/api_test.go
  5. 1 1
      pkg/csconfig/console.go
  6. 2 2
      rpm/SPECS/crowdsec.spec
  7. 1 1
      wizard.sh

+ 1 - 1
config/config.yaml

@@ -41,7 +41,7 @@ api:
     log_level: info
     listen_uri: 127.0.0.1:8080
     profiles_path: /etc/crowdsec/profiles.yaml
-    console_path: /etc/crowdsec/console_config.yaml
+    console_path: /etc/crowdsec/console.yaml
     online_client: # Central API credentials (to push signals and receive bad IPs)
       credentials_path: /etc/crowdsec/online_api_credentials.yaml
 #    tls:

+ 0 - 0
config/console_config.yaml → config/console.yaml


+ 1 - 1
debian/rules

@@ -47,5 +47,5 @@ override_dh_auto_install:
 	cp config/config.yaml debian/crowdsec/etc/crowdsec/config.yaml
 	cp config/simulation.yaml debian/crowdsec/etc/crowdsec/simulation.yaml
 	cp config/profiles.yaml debian/crowdsec/etc/crowdsec/profiles.yaml
-	cp config/console_config.yaml debian/crowdsec/etc/crowdsec/console_config.yaml
+	cp config/console.yaml debian/crowdsec/etc/crowdsec/console.yaml
 	cp -a config/patterns debian/crowdsec/etc/crowdsec

+ 1 - 1
pkg/csconfig/api_test.go

@@ -207,7 +207,7 @@ func TestLoadAPIServer(t *testing.T) {
 					DbPath: "./tests/test.db",
 					Type:   "sqlite",
 				},
-				ConsoleConfigPath: "/etc/crowdsec/console_config.yaml",
+				ConsoleConfigPath: "/etc/crowdsec/console.yaml",
 				ConsoleConfig: &ConsoleConfig{
 					ShareManualDecisions:  types.BoolPtr(false),
 					ShareTaintedScenarios: types.BoolPtr(true),

+ 1 - 1
pkg/csconfig/console.go

@@ -17,7 +17,7 @@ const (
 	SEND_MANUAL_SCENARIOS  = "manual"
 )
 
-var DefaultConsoleConfgFilePath = "/etc/crowdsec/console_config.yaml"
+var DefaultConsoleConfgFilePath = "/etc/crowdsec/console.yaml"
 
 var CONSOLE_CONFIGS = []string{SEND_CUSTOM_SCENARIOS, SEND_MANUAL_SCENARIOS, SEND_TAINTED_SCENARIOS}
 

+ 2 - 2
rpm/SPECS/crowdsec.spec

@@ -61,7 +61,7 @@ install -m 644 -D config/patterns/* -t %{buildroot}%{_sysconfdir}/crowdsec/patte
 install -m 644 -D config/config.yaml %{buildroot}%{_sysconfdir}/crowdsec
 install -m 644 -D config/simulation.yaml %{buildroot}%{_sysconfdir}/crowdsec
 install -m 644 -D config/profiles.yaml %{buildroot}%{_sysconfdir}/crowdsec
-install -m 644 -D config/console_config.yaml %{buildroot}%{_sysconfdir}/crowdsec
+install -m 644 -D config/console.yaml %{buildroot}%{_sysconfdir}/crowdsec
 install -m 644 -D %{SOURCE1} %{buildroot}%{_presetdir}
 
 install -m 551 plugins/notifications/slack/notification-slack %{buildroot}%{_libdir}/%{name}/plugins/
@@ -112,7 +112,7 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}/config.yaml
 %config(noreplace) %{_sysconfdir}/%{name}/simulation.yaml
 %config(noreplace) %{_sysconfdir}/%{name}/profiles.yaml
-%config(noreplace) %{_sysconfdir}/%{name}/console_config.yaml
+%config(noreplace) %{_sysconfdir}/%{name}/console.yaml
 %config(noreplace) %{_presetdir}/80-%{name}.preset
 %config(noreplace) %{_sysconfdir}/%{name}/notifications/http.yaml
 %config(noreplace) %{_sysconfdir}/%{name}/notifications/slack.yaml

+ 1 - 1
wizard.sh

@@ -31,7 +31,7 @@ CSCLI_BIN="./cmd/crowdsec-cli/cscli"
 CLIENT_SECRETS="local_api_credentials.yaml"
 LAPI_SECRETS="online_api_credentials.yaml"
 
-CONSOLE_FILE="console_config.yaml"
+CONSOLE_FILE="console.yaml"
 
 BIN_INSTALL_PATH="/usr/local/bin"
 CROWDSEC_BIN_INSTALLED="${BIN_INSTALL_PATH}/crowdsec"