Permalink
Browse files

Merge pull request #5 from mfojtik/readme_fix

Updated README.md and fixed how password is printed to console.
  • Loading branch information...
2 parents 901a03a + a84f913 commit 1da3132fe1138bc780a8b015f1e894eaf833904a @mfojtik mfojtik committed Mar 3, 2014
Showing with 12 additions and 12 deletions.
  1. +9 −11 .openshift/action_hooks/deploy
  2. +3 −1 README.md
@@ -14,6 +14,14 @@ initial_password=$(cat ${OPENSHIFT_BUILD_DEPENDENCIES_DIR}.initial_dokuwiki_pass
data_dir=${OPENSHIFT_DATA_DIR}data
if [ ! -d ${data_dir} ]; then
+ echo
+ echo "DokuWiki ${current_version} deployed succesfully."
+ echo
+ echo "Login: admin"
+ echo "Password: ${initial_password}"
+ echo
+ echo "NOTE: Don't forget to change your wiki admin password."
+ echo
mkdir -p ${OPENSHIFT_DATA_DIR}data
mv ${install_dir}/data/* ${data_dir}/
rm -rf ${install_dir}/data
@@ -33,14 +41,4 @@ fi
ln -sf ${dest_dir} ${OPENSHIFT_REPO_DIR}php
ln -sf ${data_dir} ${OPENSHIFT_REPO_DIR}php/data
-if [ ! -d ${data_dir}/pages ]; then
- echo
- echo "DokuWiki ${current_version} deployed succesfully."
- echo
- echo "Login: admin"
- echo "Password: ${initial_password}"
- echo
- echo "NOTE: Don't forget to change your wiki admin password."
- echo "NOTE: This message will dissapear after you create first page."
- echo
-fi
+
View
@@ -25,10 +25,12 @@ Then push the repo upstream
git push
-That's it, you can now checkout your application at (default admin account is admin/OpenShiftAdmin):
+That's it, you can now checkout your application at:
http://dokuwiki-$yournamespace.rhcloud.com
+The default user is 'admin' and the password should be printed out to console
+after first `git push`. Please change the default password after first login.
* * *

0 comments on commit 1da3132

Please sign in to comment.