Joshfischer/finalize-ci-website (#3418)
* adding asf.yaml
* removing .htaccess during the CI site build
* adding apache header
* commenting out publish block for last test
* ready to deploy for prod
* removing incorrect rm command
* clear all contents of content directory before republish
* attemtpting to correct cp command
* update asf yaml for prod
* remove htaccess file
* clean up. remove htaccess file
diff --git a/.asf.yaml b/.asf.yaml
new file mode 100644
index 0000000..fef1a18
--- /dev/null
+++ b/.asf.yaml
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+staging:
+ profile: ~
+ whoami: asf-site
+
+publish:
+ whoami: asf-site
+ hostname: http://heronstreaming.io
diff --git a/.htaccess b/.htaccess
deleted file mode 100644
index bdcbac5..0000000
--- a/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Redirect /index.html https://heron.incubator.apache.org
diff --git a/website2/website/scripts/publish_site.sh b/website2/website/scripts/publish_site.sh
index b313aba..b3bb8ea 100755
--- a/website2/website/scripts/publish_site.sh
+++ b/website2/website/scripts/publish_site.sh
@@ -38,9 +38,14 @@
git config user.email "dev@heron.incubator.apache.org"
git checkout asf-site
+
+ # clean content directory
+ rm -rf $HERON_SITE_TMP/content/
+ mkdir $HERON_SITE_TMP/content
+
# copy the generated dir
cp -r $WORK_DIR/* $HERON_SITE_TMP/content
- cp -a ${ROOT_DIR}/.htaccess ${ROOT_DIR}/content
+
# push all of the results to asf-site branch
git add -A .
git diff-index --quiet HEAD || (git commit -m "git-site-role commit from $ME" && git push -q origin HEAD:asf-site)