Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fixed spurious append instead of simple redirect
  • Loading branch information
@skoranda
skoranda committed May 28, 2017
1 parent 5ec0b8c commit 8dc5b09
Showing 10 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions comanage-registry-basic-auth/README.md
View file
@@ -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"
<?php
class DATABASE_CONFIG {
@@ -107,7 +107,7 @@ class DATABASE_CONFIG {
}
EOF
cat >> /opt/comanage-registry/Config/email.php <<"EOF"
cat > /opt/comanage-registry/Config/email.php <<"EOF"
<?php
class EmailConfig {
10 changes: 5 additions & 5 deletions comanage-registry-basic-auth/docker-comanage-entrypoint
View file
@@ -74,7 +74,7 @@ mkdir -p "$COMANAGE_REGISTRY_DIR/local/webroot/img"
# then try to create it from injected information with reasonable defaults
# that aid simple evaluation deployments.
if [ ! -e "$COMANAGE_REGISTRY_DIR/local/Config/database.php" ]; then
cat >> "$COMANAGE_REGISTRY_DIR/local/Config/database.php" <<EOF
cat > "$COMANAGE_REGISTRY_DIR/local/Config/database.php" <<EOF
<?php
class DATABASE_CONFIG {
@@ -99,7 +99,7 @@ fi
email_config="$COMANAGE_REGISTRY_DIR/local/Config/email.php"

if [ ! -e "$email_config" ]; then
cat >> "$email_config" <<EOF
cat > "$email_config" <<EOF
<?php
class EmailConfig {
@@ -119,7 +119,7 @@ fi
# Loop until we are able to open a connection to the database.
DATABASE_TEST_SCRIPT="$COMANAGE_REGISTRY_DIR/app/Console/Command/DatabaseTestShell.php"

cat >> $DATABASE_TEST_SCRIPT <<"EOF"
cat > $DATABASE_TEST_SCRIPT <<"EOF"
<?php
App::import('Model', 'ConnectionManager');
@@ -153,7 +153,7 @@ popd > "$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"
<?php
class SetupAlreadyShell extends AppShell {
@@ -247,7 +247,7 @@ fi
# If the basic auth password file does not exist create a simple version to
# aid people evaluating the tool.
if [ ! -f "/etc/apache2/passwords" ]; then
cat >> /etc/apache2/passwords <<"EOF"
cat > /etc/apache2/passwords <<"EOF"
registry.admin:$apr1$qqrvav7G$nSHYErU4ljDPmO1wNBG6e0
EOF

4 changes: 2 additions & 2 deletions comanage-registry-mod-auth-openidc/README.md
View file
@@ -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"
<?php
class DATABASE_CONFIG {
@@ -100,7 +100,7 @@ class DATABASE_CONFIG {
}
EOF
cat >> /opt/comanage-registry/Config/email.php <<"EOF"
cat > /opt/comanage-registry/Config/email.php <<"EOF"
<?php
class EmailConfig {
8 changes: 4 additions & 4 deletions comanage-registry-mod-auth-openidc/docker-comanage-entrypoint
View file
@@ -74,7 +74,7 @@ mkdir -p "$COMANAGE_REGISTRY_DIR/local/webroot/img"
# then try to create it from injected information with reasonable defaults
# that aid simple evaluation deployments.
if [ ! -e "$COMANAGE_REGISTRY_DIR/local/Config/database.php" ]; then
cat >> "$COMANAGE_REGISTRY_DIR/local/Config/database.php" <<EOF
cat > "$COMANAGE_REGISTRY_DIR/local/Config/database.php" <<EOF
<?php
class DATABASE_CONFIG {
@@ -99,7 +99,7 @@ fi
email_config="$COMANAGE_REGISTRY_DIR/local/Config/email.php"

if [ ! -e "$email_config" ]; then
cat >> "$email_config" <<EOF
cat > "$email_config" <<EOF
<?php
class EmailConfig {
@@ -119,7 +119,7 @@ fi
# Loop until we are able to open a connection to the database.
DATABASE_TEST_SCRIPT="$COMANAGE_REGISTRY_DIR/app/Console/Command/DatabaseTestShell.php"

cat >> $DATABASE_TEST_SCRIPT <<"EOF"
cat > $DATABASE_TEST_SCRIPT <<"EOF"
<?php
App::import('Model', 'ConnectionManager');
@@ -153,7 +153,7 @@ popd > "$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"
<?php
class SetupAlreadyShell extends AppShell {
4 changes: 2 additions & 2 deletions comanage-registry-shibboleth-sp/README.md
View file
@@ -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"
<?php
class DATABASE_CONFIG {
@@ -100,7 +100,7 @@ class DATABASE_CONFIG {
}
EOF
cat >> /opt/comanage-registry/Config/email.php <<"EOF"
cat > /opt/comanage-registry/Config/email.php <<"EOF"
<?php
class EmailConfig {
8 changes: 4 additions & 4 deletions comanage-registry-shibboleth-sp/docker-comanage-entrypoint
View file
@@ -74,7 +74,7 @@ mkdir -p "$COMANAGE_REGISTRY_DIR/local/webroot/img"
# then try to create it from injected information with reasonable defaults
# that aid simple evaluation deployments.
if [ ! -e "$COMANAGE_REGISTRY_DIR/local/Config/database.php" ]; then
cat >> "$COMANAGE_REGISTRY_DIR/local/Config/database.php" <<EOF
cat > "$COMANAGE_REGISTRY_DIR/local/Config/database.php" <<EOF
<?php
class DATABASE_CONFIG {
@@ -99,7 +99,7 @@ fi
email_config="$COMANAGE_REGISTRY_DIR/local/Config/email.php"

if [ ! -e "$email_config" ]; then
cat >> "$email_config" <<EOF
cat > "$email_config" <<EOF
<?php
class EmailConfig {
@@ -119,7 +119,7 @@ fi
# Loop until we are able to open a connection to the database.
DATABASE_TEST_SCRIPT="$COMANAGE_REGISTRY_DIR/app/Console/Command/DatabaseTestShell.php"

cat >> $DATABASE_TEST_SCRIPT <<"EOF"
cat > $DATABASE_TEST_SCRIPT <<"EOF"
<?php
App::import('Model', 'ConnectionManager');
@@ -153,7 +153,7 @@ popd > "$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"
<?php
class SetupAlreadyShell extends AppShell {
2 changes: 1 addition & 1 deletion comanage-registry-shibboleth-sp/docker-comanage-shibboleth-sp-entrypoint
View file
@@ -71,7 +71,7 @@ if [ ! -e /etc/shibboleth/shibboleth2.xml ]; then
fi

sed_script_file=`/bin/mktemp`
cat >> ${sed_script_file}<<EOF
cat > ${sed_script_file}<<EOF
/%%SHIBBOLETH_SP_METADATA_PROVIDER_XML%%/ {
r ${xml_content_file}
d
2 changes: 1 addition & 1 deletion comanage-registry-slapd/docker-slapd-entrypoint
View file
@@ -182,7 +182,7 @@ add: olcTLSProtocolMin
olcTLSProtocolMin: 3.2
EOF
if [[ -f /etc/ldap/slapd.ca.crt ]]; then
cat <<EOF >> /tmp/modify.ldif
cat <<EOF > /tmp/modify.ldif
-
add: olcTLSCACertificateFile
olcTLSCACertificateFile: /etc/ldap/slapd.ca.crt
4 changes: 2 additions & 2 deletions comanage-registry/README.md
View file
@@ -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"
<?php
class DATABASE_CONFIG {
@@ -104,7 +104,7 @@ class DATABASE_CONFIG {
}
EOF
cat >> /opt/comanage-registry/Config/email.php <<"EOF"
cat > /opt/comanage-registry/Config/email.php <<"EOF"
<?php
class EmailConfig {
8 changes: 4 additions & 4 deletions comanage-registry/docker-comanage-entrypoint
View file
@@ -74,7 +74,7 @@ mkdir -p "$COMANAGE_REGISTRY_DIR/local/webroot/img"
# then try to create it from injected information with reasonable defaults
# that aid simple evaluation deployments.
if [ ! -e "$COMANAGE_REGISTRY_DIR/local/Config/database.php" ]; then
cat >> "$COMANAGE_REGISTRY_DIR/local/Config/database.php" <<EOF
cat > "$COMANAGE_REGISTRY_DIR/local/Config/database.php" <<EOF
<?php
class DATABASE_CONFIG {
@@ -99,7 +99,7 @@ fi
email_config="$COMANAGE_REGISTRY_DIR/local/Config/email.php"

if [ ! -e "$email_config" ]; then
cat >> "$email_config" <<EOF
cat > "$email_config" <<EOF
<?php
class EmailConfig {
@@ -119,7 +119,7 @@ fi
# Loop until we are able to open a connection to the database.
DATABASE_TEST_SCRIPT="$COMANAGE_REGISTRY_DIR/app/Console/Command/DatabaseTestShell.php"

cat >> $DATABASE_TEST_SCRIPT <<"EOF"
cat > $DATABASE_TEST_SCRIPT <<"EOF"
<?php
App::import('Model', 'ConnectionManager');
@@ -153,7 +153,7 @@ popd > "$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"
<?php
class SetupAlreadyShell extends AppShell {

0 comments on commit 8dc5b09

Please sign in to comment.