From 5e2d792cbf8917d10afb116752e246aaeaf8d797 Mon Sep 17 00:00:00 2001 From: Everett Pompeii Date: Wed, 7 Feb 2024 07:43:09 -0500 Subject: [PATCH] linux_hierarchy --- docker-compose.yml | 5 +- docker/docker-compose.amd64.yml | 7 +-- docker/docker-compose.arm64.yml | 7 +-- services/api/.gitignore | 3 +- services/api/Dockerfile | 51 +++++++++++-------- services/api/etc/.gitignore | 3 ++ services/api/fly/fly.toml | 2 +- services/api/src/config/mod.rs | 5 +- services/api/src/main.rs | 11 ++-- services/console/Dockerfile | 32 ++++++------ .../chunks/reference/de/server-config.3.mdx | 2 +- .../chunks/reference/en/server-config.3.mdx | 2 +- .../chunks/reference/es/server-config.3.mdx | 2 +- .../chunks/reference/fr/server-config.3.mdx | 2 +- .../chunks/reference/ja/server-config.3.mdx | 2 +- .../chunks/reference/ko/server-config.3.mdx | 2 +- .../chunks/reference/pt/server-config.3.mdx | 2 +- .../chunks/reference/ru/server-config.3.mdx | 2 +- .../reference/server-config-example.mdx | 2 +- .../chunks/reference/zh/server-config.3.mdx | 2 +- 20 files changed, 80 insertions(+), 66 deletions(-) create mode 100644 services/api/etc/.gitignore diff --git a/docker-compose.yml b/docker-compose.yml index 6d3194f7b..1cf169060 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,8 +6,9 @@ services: ports: - 61016:61016 volumes: - - "./services/api/data:/usr/bin/bencher/data" - # environment: + - "./services/api/etc:/etc/bencher" + - "./services/api/data:/var/lib/bencher/data" + # environment: # Set configuration string or file path # - BENCHER_CONFIG= # - BENCHER_CONFIG_PATH= diff --git a/docker/docker-compose.amd64.yml b/docker/docker-compose.amd64.yml index ba2642be7..2abe3fa76 100644 --- a/docker/docker-compose.amd64.yml +++ b/docker/docker-compose.amd64.yml @@ -13,11 +13,12 @@ services: ports: - 61016:61016 volumes: - - "../services/api/data:/usr/bin/bencher/data" + - "../services/api/etc:/etc/bencher" + - "../services/api/data:/var/lib/bencher/data" # environment: # Set configuration string or filepath - # BENCHER_CONFIG: '{}' - # BENCHER_CONFIG_PATH: /usr/bin/bencher/data/bencher.json + # BENCHER_CONFIG: + # BENCHER_CONFIG_PATH: bencher_console_compose: build: diff --git a/docker/docker-compose.arm64.yml b/docker/docker-compose.arm64.yml index 36b90a38d..db22f30ac 100644 --- a/docker/docker-compose.arm64.yml +++ b/docker/docker-compose.arm64.yml @@ -13,11 +13,12 @@ services: ports: - 61016:61016 volumes: - - "../services/api/data:/usr/bin/bencher/data" + - "../services/api/etc:/etc/bencher" + - "../services/api/data:/var/lib/bencher/data" # environment: # Set configuration string or filepath - # BENCHER_CONFIG: '{}' - # BENCHER_CONFIG_PATH: /usr/bin/bencher/data/bencher.json + # BENCHER_CONFIG: + # BENCHER_CONFIG_PATH: bencher_console_compose: build: diff --git a/services/api/.gitignore b/services/api/.gitignore index 74da223bb..721ac790d 100644 --- a/services/api/.gitignore +++ b/services/api/.gitignore @@ -1 +1,2 @@ -*bencher.json \ No newline at end of file +*bencher.json +*litestream.yml diff --git a/services/api/Dockerfile b/services/api/Dockerfile index bb310a6c9..a87833fc8 100644 --- a/services/api/Dockerfile +++ b/services/api/Dockerfile @@ -11,12 +11,6 @@ RUN apt-get update \ pkg-config libfreetype6-dev libfontconfig1-dev \ # Stipe ca-certificates -ENV LD_LIBRARY_PATH=/usr/lib:/usr/local/lib:$LD_LIBRARY_PATH - -WORKDIR /tmp/mold -ARG MOLD_VERSION -RUN curl -L --retry 10 --silent --show-error https://github.com/rui314/mold/releases/download/v${MOLD_VERSION}/mold-${MOLD_VERSION}-$(uname -m)-linux.tar.gz | tar -C /usr/local --strip-components=1 -xzf - -RUN "$(realpath /usr/bin/ld)" != /usr/local/bin/mold && sudo ln -sf /usr/local/bin/mold "$(realpath /usr/bin/ld)"; true WORKDIR /tmp/litestream ARG LITESTREAM_VERSION @@ -24,12 +18,16 @@ ARG LITESTREAM_ARCH ARG LITESTREAM_BIN=litestream-v${LITESTREAM_VERSION}-linux-${LITESTREAM_ARCH} RUN wget https://github.com/benbjohnson/litestream/releases/download/v${LITESTREAM_VERSION}/${LITESTREAM_BIN}.tar.gz RUN tar -xzf ${LITESTREAM_BIN}.tar.gz -RUN cp -r /tmp/litestream /usr/bin/litestream -WORKDIR /usr/src/.cargo +WORKDIR /tmp/mold +ARG MOLD_VERSION +RUN curl -L --retry 10 --silent --show-error https://github.com/rui314/mold/releases/download/v${MOLD_VERSION}/mold-${MOLD_VERSION}-$(uname -m)-linux.tar.gz | tar -C /usr/local --strip-components=1 -xzf - +RUN "$(realpath /usr/bin/ld)" != /usr/local/bin/mold && sudo ln -sf /usr/local/bin/mold "$(realpath /usr/bin/ld)"; true + +WORKDIR /usr/src/bencher/.cargo COPY .cargo/config.toml config.toml -WORKDIR /usr/src/lib +WORKDIR /usr/src/bencher/lib COPY lib/bencher_adapter bencher_adapter COPY lib/bencher_boundary bencher_boundary COPY lib/bencher_comment bencher_comment @@ -41,21 +39,21 @@ COPY lib/bencher_rbac bencher_rbac COPY lib/bencher_token bencher_token COPY lib/bencher_valid bencher_valid -WORKDIR /usr/src/plus +WORKDIR /usr/src/bencher/plus COPY plus/bencher_billing bencher_billing COPY plus/bencher_bing_index bencher_bing_index COPY plus/bencher_license bencher_license COPY plus/bencher_google_index bencher_google_index -WORKDIR /usr/src +WORKDIR /usr/src/bencher COPY Cargo.toml Cargo.toml COPY Cargo.lock Cargo.lock RUN cargo init xtask -WORKDIR /usr/src/services +WORKDIR /usr/src/bencher/services RUN cargo init cli -WORKDIR /usr/src/services/api +WORKDIR /usr/src/bencher/services/api COPY services/api/migrations migrations COPY services/api/src src COPY services/api/Cargo.toml Cargo.toml @@ -64,7 +62,7 @@ COPY services/api/swagger.json swagger.json RUN cargo build --release -WORKDIR /usr/lib/bencher +WORKDIR /usr/local/bencher-deps RUN cp /usr/lib/$(uname -m)-linux-gnu/libexpat.so.1 libexpat.so.1 RUN cp /usr/lib/$(uname -m)-linux-gnu/libfontconfig.so.1 libfontconfig.so.1 RUN cp /usr/lib/$(uname -m)-linux-gnu/libfreetype.so.6 libfreetype.so.6 @@ -73,20 +71,29 @@ RUN cp /usr/lib/$(uname -m)-linux-gnu/libbrotlicommon.so.1 libbrotlicommon.so.1 RUN cp /usr/lib/$(uname -m)-linux-gnu/libbrotlidec.so.1 libbrotlidec.so.1 RUN cp /usr/lib/$(uname -m)-linux-gnu/libz.so.1 libz.so.1 -WORKDIR /usr/bin/bencher -RUN cp /usr/src/target/release/api api -RUN mkdir -p /usr/bin/bencher/data +WORKDIR /usr/lib/bencher +RUN cp /usr/src/bencher/target/release/api api +WORKDIR /var/lib/bencher/data # https://github.com/GoogleContainerTools/distroless/blob/main/cc/README.md FROM gcr.io/distroless/cc-debian12 +COPY --from=builder /tmp/litestream/litestream /usr/bin/litestream + COPY --from=builder /etc/fonts /etc/fonts COPY --from=builder /usr/include/fontconfig /usr/include/fontconfig -COPY --from=builder /usr/lib/bencher /usr/lib +COPY --from=builder /usr/local/bencher-deps /usr/lib COPY --from=builder /usr/share/fonts /usr/share/fonts -COPY --from=builder /usr/bin/litestream/litestream /usr/bin/litestream -COPY --from=builder /usr/bin/bencher /usr/bin/bencher +# Executable +COPY --from=builder /usr/lib/bencher /usr/lib/bencher +# Configuration +VOLUME /etc/bencher +# Database +COPY --from=builder /var/lib/bencher/data /var/lib/bencher/data +VOLUME /var/lib/bencher +# Logs +VOLUME /var/log/bencher -ENV PORT 61016 +EXPOSE 61016 -CMD ["/usr/bin/bencher/api"] +CMD ["/usr/lib/bencher/api"] diff --git a/services/api/etc/.gitignore b/services/api/etc/.gitignore new file mode 100644 index 000000000..cec9082b6 --- /dev/null +++ b/services/api/etc/.gitignore @@ -0,0 +1,3 @@ +* + +!.gitignore diff --git a/services/api/fly/fly.toml b/services/api/fly/fly.toml index 1e20a94ab..9f808ad4f 100644 --- a/services/api/fly/fly.toml +++ b/services/api/fly/fly.toml @@ -8,7 +8,7 @@ image = "registry.fly.io/bencher-api" [[mounts]] source = "bencher_data_machines" -destination = "/usr/bin/bencher/data" +destination = "/var/lib/bencher/data" processes = ["app"] [[services]] diff --git a/services/api/src/config/mod.rs b/services/api/src/config/mod.rs index 653f45bc6..b51eba75a 100644 --- a/services/api/src/config/mod.rs +++ b/services/api/src/config/mod.rs @@ -24,7 +24,10 @@ pub const API_NAME: &str = "Bencher API"; pub const BENCHER_CONFIG: &str = "BENCHER_CONFIG"; pub const BENCHER_CONFIG_PATH: &str = "BENCHER_CONFIG_PATH"; +#[cfg(debug_assertions)] const DEFAULT_CONFIG_PATH: &str = "bencher.json"; +#[cfg(not(debug_assertions))] +const DEFAULT_CONFIG_PATH: &str = "/etc/bencher/bencher.json"; const DEFAULT_IP: IpAddr = IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)); // 1 megabyte or 1_048_576 bytes @@ -32,7 +35,7 @@ const DEFAULT_MAX_BODY_SIZE: usize = 2 << 19; #[cfg(debug_assertions)] const DEFAULT_DB_PATH: &str = "data/bencher.db"; #[cfg(not(debug_assertions))] -const DEFAULT_DB_PATH: &str = "/usr/bin/bencher/data/bencher.db"; +const DEFAULT_DB_PATH: &str = "/var/lib/bencher/data/bencher.db"; const DEFAULT_SMTP_PORT: u16 = 587; #[cfg(debug_assertions)] diff --git a/services/api/src/main.rs b/services/api/src/main.rs index 90a0b3564..9dd61f15b 100644 --- a/services/api/src/main.rs +++ b/services/api/src/main.rs @@ -1,5 +1,5 @@ #[cfg(feature = "sentry")] -use std::path::{Path, PathBuf}; +use std::path::PathBuf; use bencher_api::{ config::{config_tx::ConfigTx, Config}, @@ -179,11 +179,10 @@ fn run_litestream( .map_err(LitestreamError::Database)? .join(&config.database.file) }; - // The Litestream config file is always in the same directory as the database - let config_path = db_path - .parent() - .map_or(PathBuf::from("/"), Path::to_path_buf) - .join("litestream.yml"); + #[cfg(debug_assertions)] + let config_path = PathBuf::from("litestream.yml"); + #[cfg(not(debug_assertions))] + let config_path = PathBuf::from("/etc/litestream.yml"); let yaml = litestream .into_yaml(db_path.clone(), config.logging.log.level()) .map_err(LitestreamError::Yaml)?; diff --git a/services/console/Dockerfile b/services/console/Dockerfile index cdad52843..e35b0b5fb 100644 --- a/services/console/Dockerfile +++ b/services/console/Dockerfile @@ -3,7 +3,7 @@ FROM rust:1.75.0-bookworm as wasm-builder RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh -WORKDIR /usr/src/lib +WORKDIR /usr/src/bencher/lib RUN cargo init --lib bencher_adapter RUN cargo init --lib bencher_boundary RUN cargo init --lib bencher_comment @@ -15,33 +15,33 @@ RUN cargo init --lib bencher_rbac RUN cargo init --lib bencher_token COPY lib/bencher_valid bencher_valid -WORKDIR /usr/src/plus +WORKDIR /usr/src/bencher/plus RUN cargo init --lib bencher_billing RUN cargo init --lib bencher_bing_index RUN cargo init --lib bencher_license RUN cargo init --lib bencher_google_index -WORKDIR /usr/src +WORKDIR /usr/src/bencher COPY Cargo.toml Cargo.toml COPY Cargo.lock Cargo.lock RUN cargo init xtask -WORKDIR /usr/src/services +WORKDIR /usr/src/bencher/services RUN cargo init api RUN cargo init cli -WORKDIR /usr/src/services/console +WORKDIR /usr/src/bencher/services/console COPY services/console/build_wasm.sh build_wasm.sh RUN chmod +x build_wasm.sh RUN ./build_wasm.sh # https://hub.docker.com/_/node FROM node:20.11.0-bookworm as builder -COPY services/api/swagger.json /usr/src/services/api/swagger.json -COPY services/cli/templates/output /usr/src/services/cli/templates/output -COPY --from=wasm-builder /usr/src/lib/bencher_valid/pkg /usr/src/lib/bencher_valid/pkg +COPY services/api/swagger.json /usr/src/bencher/services/api/swagger.json +COPY services/cli/templates/output /usr/src/bencher/services/cli/templates/output +COPY --from=wasm-builder /usr/src/bencher/lib/bencher_valid/pkg /usr/src/bencher/lib/bencher_valid/pkg -WORKDIR /usr/src/services/console +WORKDIR /usr/src/bencher/services/console COPY services/console/package-lock.json package-lock.json COPY services/console/package.json package.json @@ -58,24 +58,22 @@ RUN npm run node # https://hub.docker.com/_/node FROM node:20.11.0-bookworm as packager -COPY --from=builder /usr/src/services/console/dist /usr/src/services/console/dist -COPY --from=builder /usr/src/services/console/package-lock.json /usr/src/services/console/package-lock.json -COPY --from=builder /usr/src/services/console/package.json /usr/src/services/console/package.json +COPY --from=builder /usr/src/bencher/services/console/dist /usr/src/bencher/services/console/dist +COPY --from=builder /usr/src/bencher/services/console/package-lock.json /usr/src/bencher/services/console/package-lock.json +COPY --from=builder /usr/src/bencher/services/console/package.json /usr/src/bencher/services/console/package.json -WORKDIR /usr/src/services/console +WORKDIR /usr/src/bencher/services/console # https://github.com/withastro/astro/issues/7247#issuecomment-1576200139 # https://github.com/GoogleContainerTools/distroless/blob/main/examples/nodejs/Dockerfile RUN npm ci --omit=dev # https://github.com/GoogleContainerTools/distroless/tree/main/nodejs FROM gcr.io/distroless/nodejs20-debian12 -COPY --from=packager /usr/src/services/console /usr/bin/bencher - -WORKDIR /usr/bin/bencher +COPY --from=packager /usr/src/bencher/services/console /usr/src/bencher ENV HOST=0.0.0.0 ENV PORT=3000 ENV BENCHER_API_URL=http://localhost:61016 EXPOSE 3000 -CMD ["/usr/bin/bencher/dist/server/entry.mjs"] \ No newline at end of file +CMD ["/usr/src/bencher/dist/server/entry.mjs"] \ No newline at end of file diff --git a/services/console/src/chunks/reference/de/server-config.3.mdx b/services/console/src/chunks/reference/de/server-config.3.mdx index 30dbcc361..21ddfee9c 100644 --- a/services/console/src/chunks/reference/de/server-config.3.mdx +++ b/services/console/src/chunks/reference/de/server-config.3.mdx @@ -15,7 +15,7 @@ Dieser Abschnitt basiert auf der [Dropshot Logging Konfiguration](https://github | Name | Beispiel | Standard | Erforderlich | Beschreibung | | :--------------------------: | :---------------------------------------------------------------------------: | :--------------------------------: | :------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| file | "pfad/zu/database.db" | "/usr/bin/bencher/data/bencher.db" | Ja | Legt fest, wo die Serverdatenbank hingehen soll. | +| file | "pfad/zu/database.db" | "/var/lib/bencher/data/bencher.db" | Ja | Legt fest, wo die Serverdatenbank hingehen soll. | | data_store.service | "aws_s3" | --- | Nein | Gibt den entfernten Datenspeicherdienst an. Gültige Werte sind "aws_s3". | | data_store.access_key_id | "ABC123DoRemMiABC123" | --- | Nur wenn data_store.service = "aws_s3" | Wenn data_store.service "aws_s3" ist, gibt diese Eigenschaft die AWS-Zugangsschlüssel-ID an. Siehe auch data_store.service. | | data_store.secret_access_key | "AA3Chr-JSF5sUQqKwayx-FvCfZKsMev-5BqPpcFC3m7" | --- | Nur wenn data_store.service = "aws_s3" | Wenn data_store.service "aws_s3" ist, gibt diese Eigenschaft den AWS geheimen Zugangsschlüssel an. Siehe auch data_store.service. Im Protokoll erscheint es als `************`. | diff --git a/services/console/src/chunks/reference/en/server-config.3.mdx b/services/console/src/chunks/reference/en/server-config.3.mdx index a0fa548b1..8ecc91ee5 100644 --- a/services/console/src/chunks/reference/en/server-config.3.mdx +++ b/services/console/src/chunks/reference/en/server-config.3.mdx @@ -15,7 +15,7 @@ This section is based on the [Dropshot logging configuration](https://github.com | Name | Example | Default | Required | Description | | :--------------------------: | :---------------------------------------------------------------------------: | :--------------------------------: | :-----------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| file | "path/to/database.db" | "/usr/bin/bencher/data/bencher.db" | Yes | Controls where server database will go. | +| file | "path/to/database.db" | "/var/lib/bencher/data/bencher.db" | Yes | Controls where server database will go. | | data_store.service | "aws_s3" | --- | No | Specifies the remote data store service. Valid values are "aws_s3". | | data_store.access_key_id | "ABC123DoRemMiABC123" | --- | Only if data_store.service = "aws_s3" | If data_store.service = "aws_s3", this property specifies the AWS access key ID. See also data_store.service. | | data_store.secret_access_key | "AA3Chr-JSF5sUQqKwayx-FvCfZKsMev-5BqPpcFC3m7" | --- | Only if data_store.service = "aws_s3" | If data_store.service = "aws_s3", this property specifies the AWS secret access key. See also data_store.service. Whenever logged, it will appear obfuscated as `************`. | diff --git a/services/console/src/chunks/reference/es/server-config.3.mdx b/services/console/src/chunks/reference/es/server-config.3.mdx index 52c4a50f7..4313ccd63 100644 --- a/services/console/src/chunks/reference/es/server-config.3.mdx +++ b/services/console/src/chunks/reference/es/server-config.3.mdx @@ -14,7 +14,7 @@ Esta sección se basa en la [configuración de registro de Dropshot](https://git | Nombre | Ejemplo | Default | Requerido | Descripción | | :--------------------------: | :--------------------------------------------------------------------------------------------: | :--------------------------------: | :-----------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| file | "ruta/hacia/database.db" | "/usr/bin/bencher/data/bencher.db" | Sí | Controla hacia donde irá la base de datos del servidor. | +| file | "ruta/hacia/database.db" | "/var/lib/bencher/data/bencher.db" | Sí | Controla hacia donde irá la base de datos del servidor. | | data_store.service | "aws_s3" | --- | No | Especifica el servicio de almacenamiento de datos remoto. Los valores válidos son "aws_s3". | | data_store.access_key_id | "ABC123DoRemMiABC123" | --- | Solo si data_store.service = "aws_s3" | Si data_store.service = "aws_s3", esta propiedad especifica el ID de clave de acceso de AWS. Ver también data_store.service. | | data_store.secret_access_key | "AA3Chr-JSF5sUQqKwayx-FvCfZKsMev-5BqPpcFC3m7" | --- | Solo si data_store.service = "aws_s3" | Si data_store.service = "aws_s3", esta propiedad especifica la clave de acceso secreta de AWS. Ver también data_store.service. Cuando se registra, aparecerá ofuscado como `************`. | diff --git a/services/console/src/chunks/reference/fr/server-config.3.mdx b/services/console/src/chunks/reference/fr/server-config.3.mdx index f7e846672..d4b621513 100644 --- a/services/console/src/chunks/reference/fr/server-config.3.mdx +++ b/services/console/src/chunks/reference/fr/server-config.3.mdx @@ -15,7 +15,7 @@ Cette section est basée sur la [configuration de logging Dropshot](https://gith | Nom | Exemple | Par défaut | Requis | Description | | :--------------------------: | :---------------------------------------------------------------------------: | :--------------------------------: | :----------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| file | "path/to/database.db" | "/usr/bin/bencher/data/bencher.db" | Oui | Contrôle où la base de données du serveur sera envoyée. | +| file | "path/to/database.db" | "/var/lib/bencher/data/bencher.db" | Oui | Contrôle où la base de données du serveur sera envoyée. | | data_store.service | "aws_s3" | --- | Non | Spécifie le service de stockage de données à distance. Les valeurs valides sont "aws_s3". | | data_store.access_key_id | "ABC123DoRemMiABC123" | --- | Seulement si data_store.service = "aws_s3" | Si data_store.service = "aws_s3", cette propriété spécifie l'ID de la clé d'accès AWS. Voir aussi data_store.service. | | data_store.secret_access_key | "AA3Chr-JSF5sUQqKwayx-FvCfZKsMev-5BqPpcFC3m7" | --- | Seulement si data_store.service = "aws_s3" | Si data_store.service = "aws_s3", cette propriété spécifie la clé d'accès secrète AWS. Voir aussi data_store.service. Lorsqu'elle est enregistrée, elle apparaîtra sous forme obfusquée, c'est-à-dire `************`. | diff --git a/services/console/src/chunks/reference/ja/server-config.3.mdx b/services/console/src/chunks/reference/ja/server-config.3.mdx index 6abf3d091..7ef7e50f4 100644 --- a/services/console/src/chunks/reference/ja/server-config.3.mdx +++ b/services/console/src/chunks/reference/ja/server-config.3.mdx @@ -15,7 +15,7 @@ | 名前 | 例 | デフォルト値 | 必須項目 | 説明 | | :--------------------------: | :---------------------------------------------------------------------------: | :--------------------------------: | :-------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| file | "path/to/database.db" | "/usr/bin/bencher/data/bencher.db" | はい | サーバーデータベースがどこに行くかを制御します。 | +| file | "path/to/database.db" | "/var/lib/bencher/data/bencher.db" | はい | サーバーデータベースがどこに行くかを制御します。 | | data_store.service | "aws_s3" | --- | いいえ | 遠隔データストアサービスを指定します。有効な値は "aws_s3" です。 | | data_store.access_key_id | "ABC123DoRemMiABC123" | --- | data_store.service = "aws_s3"の場合のみ | data_store.service = "aws_s3" の場合、このプロパティは AWS アクセスキー ID を指定します。 data_store.service も参照してください。 | | data_store.secret_access_key | "AA3Chr-JSF5sUQqKwayx-FvCfZKsMev-5BqPpcFC3m7" | --- | data_store.service = "aws_s3"の場合のみ | data_store.service = "aws_s3" の場合、このプロパティは AWS シークレットアクセスキーを指定します。 data_store.service も参照してください。ログ時には `************` として表示されます。 | diff --git a/services/console/src/chunks/reference/ko/server-config.3.mdx b/services/console/src/chunks/reference/ko/server-config.3.mdx index 08bf63c6c..cabb53959 100644 --- a/services/console/src/chunks/reference/ko/server-config.3.mdx +++ b/services/console/src/chunks/reference/ko/server-config.3.mdx @@ -15,7 +15,7 @@ | 이름 | 예제 | 기본값 | 필수 여부 | 설명 | | :--------------------------: | :---------------------------------------------------------------------------: | :--------------------------------: | :------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| file | "path/to/database.db" | "/usr/bin/bencher/data/bencher.db" | 예 | 서버 데이터베이스가 위치할 곳을 제어합니다. | +| file | "path/to/database.db" | "/var/lib/bencher/data/bencher.db" | 예 | 서버 데이터베이스가 위치할 곳을 제어합니다. | | data_store.service | "aws_s3" | --- | 아니오 | 원격 데이터 저장소 서비스를 지정합니다. 유효한 값은 "aws_s3"입니다. | | data_store.access_key_id | "ABC123DoRemMiABC123" | --- | data_store.service = "aws_s3"인 경우만 | data_store.service = "aws_s3"인 경우, 이 속성은 AWS 액세스 키 ID를 지정합니다. data_store.service 에 대해서도 참조하십시오. | | data_store.secret_access_key | "AA3Chr-JSF5sUQqKwayx-FvCfZKsMev-5BqPpcFC3m7" | --- | data_store.service = "aws_s3"인 경우만 | data_store.service = "aws_s3"인 경우, 이 속성은 AWS secret access key를 지정합니다. data_store.service에 대해서도 참조하십시오. 로그에 기록될 때 `************`로 표현됩니다. | diff --git a/services/console/src/chunks/reference/pt/server-config.3.mdx b/services/console/src/chunks/reference/pt/server-config.3.mdx index 7d837301f..c373a3618 100644 --- a/services/console/src/chunks/reference/pt/server-config.3.mdx +++ b/services/console/src/chunks/reference/pt/server-config.3.mdx @@ -15,7 +15,7 @@ Esta seção é baseada na [configuração de logging do Dropshot](https://githu | Nome | Exemplo | Padrão | Obrigatório | Descrição | | :--------------------------: | :---------------------------------------------------------------------------: | :--------------------------------: | :-------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| file | "path/to/database.db" | "/usr/bin/bencher/data/bencher.db" | Sim | Controla para onde vai a base de dados do servidor. | +| file | "path/to/database.db" | "/var/lib/bencher/data/bencher.db" | Sim | Controla para onde vai a base de dados do servidor. | | data_store.service | "aws_s3" | --- | Não | Especifica o serviço de armazenamento de dados remoto. Valores validos são "aws_s3". | | data_store.access_key_id | "ABC123DoRemMiABC123" | --- | Apenas se data_store.service = "aws_s3" | Se data_store.service = "aws_s3", esta propriedade especifica o ID da chave de acesso do AWS. Veja também data_store.service. | | data_store.secret_access_key | "AA3Chr-JSF5sUQqKwayx-FvCfZKsMev-5BqPpcFC3m7" | --- | Apenas se data_store.service = "aws_s3" | Se data_store.service = "aws_s3", esta propriedade especifica a chave de acesso secreta do AWS. Veja também data_store.service. Quando registrada, ela aparecerá obfuscada como `************`. | diff --git a/services/console/src/chunks/reference/ru/server-config.3.mdx b/services/console/src/chunks/reference/ru/server-config.3.mdx index 1790455dd..9b9757abf 100644 --- a/services/console/src/chunks/reference/ru/server-config.3.mdx +++ b/services/console/src/chunks/reference/ru/server-config.3.mdx @@ -15,7 +15,7 @@ | Имя | Пример | По умолчанию | Обязательно | Описание | | :--------------------------: | :---------------------------------------------------------------------------: | :--------------------------------: | :---------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| file | "path/to/database.db" | "/usr/bin/bencher/data/bencher.db" | Да | Управляет расположением базы данных сервера. | +| file | "path/to/database.db" | "/var/lib/bencher/data/bencher.db" | Да | Управляет расположением базы данных сервера. | | data_store.service | "aws_s3" | --- | Нет | Задает внешний сервис для хранения данных. Допустимые значения - "aws_s3". | | data_store.access_key_id | "ABC123DoRemMiABC123" | --- | Только если data_store.service = "aws_s3" | Если data_store.service = "aws_s3", это свойство указывает идентификатор ключа доступа AWS. Смотрите также data_store.service. | | data_store.secret_access_key | "AA3Chr-JSF5sUQqKwayx-FvCfZKsMev-5BqPpcFC3m7" | --- | Только если data_store.service = "aws_s3" | Если data_store.service = "aws_s3", это свойство указывает секретный ключ доступа AWS. Смотрите также data_store.service. При логировании он будет обфусцирован как `************`. | diff --git a/services/console/src/chunks/reference/server-config-example.mdx b/services/console/src/chunks/reference/server-config-example.mdx index a2703dca6..116e6cc65 100644 --- a/services/console/src/chunks/reference/server-config-example.mdx +++ b/services/console/src/chunks/reference/server-config-example.mdx @@ -25,7 +25,7 @@ }, }, "database": { - "file": "/usr/bin/bencher/data/bencher.db", + "file": "/var/lib/bencher/data/bencher.db", "data_store": { "service": "aws_s3" "access_key_id": "ABC123DoRemMiABC123", diff --git a/services/console/src/chunks/reference/zh/server-config.3.mdx b/services/console/src/chunks/reference/zh/server-config.3.mdx index 245d21aa4..d3a4339d1 100644 --- a/services/console/src/chunks/reference/zh/server-config.3.mdx +++ b/services/console/src/chunks/reference/zh/server-config.3.mdx @@ -15,7 +15,7 @@ | 名称 | 例子 | 默认值 | 必选项 | 说明 | | :--------------------------: | :---------------------------------------------------------------------------: | :--------------------------------: | :----------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| file | "path/to/database.db" | "/usr/bin/bencher/data/bencher.db" | 是 | 控制服务器数据库的位置。 | +| file | "path/to/database.db" | "/var/lib/bencher/data/bencher.db" | 是 | 控制服务器数据库的位置。 | | data_store.service | "aws_s3" | --- | 否 | 指定远程数据存储服务。有效值为 "aws_s3"。 | | data_store.access_key_id | "ABC123DoRemMiABC123" | --- | 仅在 data_store.service = "aws_s3"时 | 如果 data_store.service = "aws_s3"，此属性指定 AWS 访问密钥 ID。参见 data_store.service。 | | data_store.secret_access_key | "AA3Chr-JSF5sUQqKwayx-FvCfZKsMev-5BqPpcFC3m7" | --- | 仅在 data_store.service = "aws_s3"时 | 如果 data_store.service = "aws_s3"，此属性指定 AWS 私密访问密钥。参见 data_store.service。当进行记录时，它将显示为 `************`。 |