diff --git a/docker/mega_mono_dockerfile b/docker/mega_mono_dockerfile index c93002c62..7e4f130ee 100644 --- a/docker/mega_mono_dockerfile +++ b/docker/mega_mono_dockerfile @@ -57,6 +57,6 @@ COPY --from=builder /opt/mega/docker/start_mono.sh /usr/local/bin/start_mono.sh RUN chmod +x /usr/local/bin/start_mono.sh RUN chmod +x /usr/local/bin/mono -VOLUME /opt/mega/etc +VOLUME /opt/mega CMD ["bash", "-c", "/usr/local/bin/start_mono.sh"] \ No newline at end of file diff --git a/docker/start_mono.sh b/docker/start_mono.sh index eef43412f..fcf450684 100755 --- a/docker/start_mono.sh +++ b/docker/start_mono.sh @@ -1,7 +1,7 @@ #!/bin/sh -export MEGA_BASE_DIR="/opt/mega/etc" -CONFIG_FILE="$MEGA_BASE_DIR/config.toml" +export MEGA_BASE_DIR="/opt/mega" +CONFIG_FILE="$MEGA_BASE_DIR/etc/config.toml" # check if config file exists if [ -f "$CONFIG_FILE" ]; then diff --git a/mono/config.toml b/mono/config.toml index c5454dd0d..23ff251b1 100644 --- a/mono/config.toml +++ b/mono/config.toml @@ -89,5 +89,5 @@ split_size = 20971520 # Default size is 20MB (20971520 bytes) [oauth] # GitHub OAuth application client id and secret -github_client_id = "Ov23li3y0koaZFzk8CUE" -github_client_secret = "58babfc9794ca137feff59c57c82ef6f5318ec37" \ No newline at end of file +github_client_id = "" +github_client_secret = "" \ No newline at end of file diff --git a/saturn/src/context.rs b/saturn/src/context.rs index 49fbc6bea..c5bb0ab28 100644 --- a/saturn/src/context.rs +++ b/saturn/src/context.rs @@ -55,7 +55,7 @@ impl AppContext { let policies_path = policies_path.into(); let schema_file = std::fs::File::open(schema_path)?; - let (schema, _) = Schema::from_file_natural(schema_file).unwrap(); + let (schema, _) = Schema::from_cedarschema_file(schema_file).unwrap(); let policy_src = std::fs::read_to_string(policies_path)?; let policies = policy_src.parse()?; let validator = Validator::new(schema.clone());