From 8dc5b095dd47787c959e87f6bd8dd899f2461b49 Mon Sep 17 00:00:00 2001 From: Scott Koranda Date: Sun, 28 May 2017 18:48:59 -0500 Subject: [PATCH] fixed spurious append instead of simple redirect --- comanage-registry-basic-auth/README.md | 4 ++-- .../docker-comanage-entrypoint | 10 +++++----- comanage-registry-mod-auth-openidc/README.md | 4 ++-- .../docker-comanage-entrypoint | 8 ++++---- comanage-registry-shibboleth-sp/README.md | 4 ++-- .../docker-comanage-entrypoint | 8 ++++---- .../docker-comanage-shibboleth-sp-entrypoint | 2 +- comanage-registry-slapd/docker-slapd-entrypoint | 2 +- comanage-registry/README.md | 4 ++-- comanage-registry/docker-comanage-entrypoint | 8 ++++---- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/comanage-registry-basic-auth/README.md b/comanage-registry-basic-auth/README.md index 5efebbf..22685ff 100644 --- a/comanage-registry-basic-auth/README.md +++ b/comanage-registry-basic-auth/README.md @@ -89,7 +89,7 @@ configuration file: ``` mkdir -p /opt/comanage-registry/Config -cat >> /opt/comanage-registry/Config/database.php <<"EOF" +cat > /opt/comanage-registry/Config/database.php <<"EOF" > /opt/comanage-registry/Config/email.php <<"EOF" +cat > /opt/comanage-registry/Config/email.php <<"EOF" > "$COMANAGE_REGISTRY_DIR/local/Config/database.php" < "$COMANAGE_REGISTRY_DIR/local/Config/database.php" <> "$email_config" < "$email_config" <> $DATABASE_TEST_SCRIPT <<"EOF" +cat > $DATABASE_TEST_SCRIPT <<"EOF" "$OUTPUT" 2>&1 # we create an ephemeral CakePHP script to tell us. SETUP_ALREADY_SCRIPT="$COMANAGE_REGISTRY_DIR/app/Console/Command/SetupAlreadyShell.php" -cat >> $SETUP_ALREADY_SCRIPT <<"EOF" +cat > $SETUP_ALREADY_SCRIPT <<"EOF" > /etc/apache2/passwords <<"EOF" + cat > /etc/apache2/passwords <<"EOF" registry.admin:$apr1$qqrvav7G$nSHYErU4ljDPmO1wNBG6e0 EOF diff --git a/comanage-registry-mod-auth-openidc/README.md b/comanage-registry-mod-auth-openidc/README.md index a1cbf85..3f90e83 100644 --- a/comanage-registry-mod-auth-openidc/README.md +++ b/comanage-registry-mod-auth-openidc/README.md @@ -82,7 +82,7 @@ configuration file: ``` mkdir -p /opt/comanage-registry/Config -cat >> /opt/comanage-registry/Config/database.php <<"EOF" +cat > /opt/comanage-registry/Config/database.php <<"EOF" > /opt/comanage-registry/Config/email.php <<"EOF" +cat > /opt/comanage-registry/Config/email.php <<"EOF" > "$COMANAGE_REGISTRY_DIR/local/Config/database.php" < "$COMANAGE_REGISTRY_DIR/local/Config/database.php" <> "$email_config" < "$email_config" <> $DATABASE_TEST_SCRIPT <<"EOF" +cat > $DATABASE_TEST_SCRIPT <<"EOF" "$OUTPUT" 2>&1 # we create an ephemeral CakePHP script to tell us. SETUP_ALREADY_SCRIPT="$COMANAGE_REGISTRY_DIR/app/Console/Command/SetupAlreadyShell.php" -cat >> $SETUP_ALREADY_SCRIPT <<"EOF" +cat > $SETUP_ALREADY_SCRIPT <<"EOF" > /opt/comanage-registry/Config/database.php <<"EOF" +cat > /opt/comanage-registry/Config/database.php <<"EOF" > /opt/comanage-registry/Config/email.php <<"EOF" +cat > /opt/comanage-registry/Config/email.php <<"EOF" > "$COMANAGE_REGISTRY_DIR/local/Config/database.php" < "$COMANAGE_REGISTRY_DIR/local/Config/database.php" <> "$email_config" < "$email_config" <> $DATABASE_TEST_SCRIPT <<"EOF" +cat > $DATABASE_TEST_SCRIPT <<"EOF" "$OUTPUT" 2>&1 # we create an ephemeral CakePHP script to tell us. SETUP_ALREADY_SCRIPT="$COMANAGE_REGISTRY_DIR/app/Console/Command/SetupAlreadyShell.php" -cat >> $SETUP_ALREADY_SCRIPT <<"EOF" +cat > $SETUP_ALREADY_SCRIPT <<"EOF" > ${sed_script_file}< ${sed_script_file}<> /tmp/modify.ldif + cat < /tmp/modify.ldif - add: olcTLSCACertificateFile olcTLSCACertificateFile: /etc/ldap/slapd.ca.crt diff --git a/comanage-registry/README.md b/comanage-registry/README.md index de2903a..964ef19 100644 --- a/comanage-registry/README.md +++ b/comanage-registry/README.md @@ -86,7 +86,7 @@ configuration file: ``` mkdir -p /opt/comanage-registry/Config -cat >> /opt/comanage-registry/Config/database.php <<"EOF" +cat > /opt/comanage-registry/Config/database.php <<"EOF" > /opt/comanage-registry/Config/email.php <<"EOF" +cat > /opt/comanage-registry/Config/email.php <<"EOF" > "$COMANAGE_REGISTRY_DIR/local/Config/database.php" < "$COMANAGE_REGISTRY_DIR/local/Config/database.php" <> "$email_config" < "$email_config" <> $DATABASE_TEST_SCRIPT <<"EOF" +cat > $DATABASE_TEST_SCRIPT <<"EOF" "$OUTPUT" 2>&1 # we create an ephemeral CakePHP script to tell us. SETUP_ALREADY_SCRIPT="$COMANAGE_REGISTRY_DIR/app/Console/Command/SetupAlreadyShell.php" -cat >> $SETUP_ALREADY_SCRIPT <<"EOF" +cat > $SETUP_ALREADY_SCRIPT <<"EOF"