Merge pull request #20225 from vikram-redhat/master

assemble script diff

Author: vikram-redhat

.s2i/bin/assemble

@@ -83,15 +83,18 @@ if [[ ! -z "$HTACCESS_DIRS" ]]; then
     IFS=':'; directories=($HTACCESS_DIRS); unset IFS;
     for dir in "${directories[@]}"; do
         echo "--->     Adding .htpasswd protection to $dir"
-        echo -e 'AuthType Basic\nAuthName "Access to the stage docs"\nAuthUserFile /opt/app-root/src/.htpasswd\nRequire valid-user' > $dir/.htaccess
 
-        echo "--->     Creating robots.txt to prevent crawling protected dir $dir"
-        PACKAGE=$(echo $dir | cut -d / -f 1)
-        TYPE=$(echo $dir | cut -d / -f 2)
-        URL_DIR=$(echo $dir | cut -d / -f 3)
-        URL_VERSION=$(echo $dir | cut -d / -f 4)
-        touch $PACKAGE/$TYPE/robots.txt
-        echo -e "User-agent: *\nDisallow: /$URL_DIR/$URL_VERSION" >> $PACKAGE/$TYPE/robots.txt
+        # brute force separate password for container-platform-ocp distribution
+        if [ $dir = "commercial_package/commercial/container-platform-ocp/4.3" ]; then
+          echo "--->     separate .htpasswd protection to $dir"
+
+          echo -e 'AuthType Basic\nAuthName "Access to the stage docs"\nAuthUserFile /opt/app-root/src/.htpasswdocp\nRequire valid-user' > $dir/.htaccess
+
+          echo 'openshift:$apr1$c41fpuxh$jHe/W0gYLffn6501Cx2TS/' > commercial_package/commercial/.htpasswdocp
+        else
+          echo -e 'AuthType Basic\nAuthName "Access to the stage docs"\nAuthUserFile /opt/app-root/src/.htpasswd\nRequire valid-user' > $dir/.htaccess
+        fi
+
     done
     echo 'redhat:$apr1$1HYe8rB6$6pa5OVd01quYUYl8ymyqK0' > commercial_package/commercial/.htpasswd
     echo 'redhat:$apr1$1HYe8rB6$6pa5OVd01quYUYl8ymyqK0' > community_package/community/.htpasswd