free/freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change how the image password is used

Browse Source
This commit is contained in:
Bob Mottram 2016-11-19 09:37:35 +00:00
parent 8b84dc19a9
commit 8a307d4eae
9 changed files with 36 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/freedombone-app-dokuwiki
View File

@ -279,10 +279,10 @@ function install_dokuwiki {
function_check get_dokuwiki_admin_password function_check get_dokuwiki_admin_password
get_dokuwiki_admin_password get_dokuwiki_admin_password
if [ ! $DOKUWIKI_ADMIN_PASSWORD ]; then if [ -f $IMAGE_PASSWORD_FILE ]; then
if [ -f $IMAGE_PASSWORD_FILE ]; then DOKUWIKI_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
DOKUWIKI_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)" else
else if [ ! $DOKUWIKI_ADMIN_PASSWORD ]; then
DOKUWIKI_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})" DOKUWIKI_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
fi fi
fi fi

8
src/freedombone-app-ghost
View File

@ -288,10 +288,10 @@ function ghost_create_database {
function_check get_mariadb_git_admin_password function_check get_mariadb_git_admin_password
get_mariadb_git_admin_password get_mariadb_git_admin_password
if [ ! ${GIT_ADMIN_PASSWORD} ]; then if [ -f ${IMAGE_PASSWORD_FILE} ]; then
if [ -f ${IMAGE_PASSWORD_FILE} ]; then GIT_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
GIT_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)" else
else if [ ! ${GIT_ADMIN_PASSWORD} ]; then
GIT_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})" GIT_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
fi fi
fi fi

8
src/freedombone-app-gnusocial
View File

@ -202,10 +202,10 @@ function get_mariadb_gnusocial_admin_password {
function gnusocial_create_database { function gnusocial_create_database {
function_check get_mariadb_gnusocial_admin_password function_check get_mariadb_gnusocial_admin_password
get_mariadb_gnusocial_admin_password get_mariadb_gnusocial_admin_password
if [ ! $GNUSOCIAL_ADMIN_PASSWORD ]; then if [ -f $IMAGE_PASSWORD_FILE ]; then
if [ -f $IMAGE_PASSWORD_FILE ]; then GNUSOCIAL_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
GNUSOCIAL_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)" else
else if [ ! $GNUSOCIAL_ADMIN_PASSWORD ]; then
GNUSOCIAL_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})" GNUSOCIAL_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
fi fi
fi fi

8
src/freedombone-app-gogs
View File

@ -127,10 +127,10 @@ function gogs_create_database {
function_check get_mariadb_git_admin_password function_check get_mariadb_git_admin_password
get_mariadb_git_admin_password get_mariadb_git_admin_password
if [ ! ${GIT_ADMIN_PASSWORD} ]; then if [ -f ${IMAGE_PASSWORD_FILE} ]; then
if [ -f ${IMAGE_PASSWORD_FILE} ]; then GIT_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
GIT_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)" else
else if [ ! ${GIT_ADMIN_PASSWORD} ]; then
GIT_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})" GIT_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
fi fi
fi fi

14
src/freedombone-app-htmly
View File

@ -388,20 +388,14 @@ function install_htmly_user {
# create a user password # create a user password
function_check get_htmly_admin_password function_check get_htmly_admin_password
get_htmly_admin_password get_htmly_admin_password
if [ -f $IMAGE_PASSWORD_FILE ]; then
HTMLY_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
fi
if [ ! $HTMLY_ADMIN_PASSWORD ]; then if [ ! $HTMLY_ADMIN_PASSWORD ]; then
if [ -f $IMAGE_PASSWORD_FILE ]; then HTMLY_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
HTMLY_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
else
HTMLY_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
fi
echo '' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README
echo $'# htmly' >> /home/$MY_USERNAME/README echo $'# htmly' >> /home/$MY_USERNAME/README
echo $"Your htmly username: $MY_USERNAME" >> /home/$MY_USERNAME/README echo $"Your htmly username: $MY_USERNAME" >> /home/$MY_USERNAME/README
echo $"Your htmly password is: $HTMLY_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README echo $"Your htmly password is: $HTMLY_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
if [[ $ONION_ONLY == 'no' ]]; then
echo $"Log into your htmly at https://$HTMLY_DOMAIN_NAME/login" >> /home/$MY_USERNAME/README
fi
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
chmod 600 /home/$MY_USERNAME/README chmod 600 /home/$MY_USERNAME/README
fi fi

9
src/freedombone-app-hubzilla
View File

@ -180,12 +180,11 @@ function get_mariadb_hubzilla_admin_password {
function hubzilla_create_database { function hubzilla_create_database {
function_check get_mariadb_hubzilla_admin_password function_check get_mariadb_hubzilla_admin_password
get_mariadb_hubzilla_admin_password get_mariadb_hubzilla_admin_password
if [ -f $IMAGE_PASSWORD_FILE ]; then
HUBZILLA_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
fi
if [ ! $HUBZILLA_ADMIN_PASSWORD ]; then if [ ! $HUBZILLA_ADMIN_PASSWORD ]; then
if [ -f $IMAGE_PASSWORD_FILE ]; then HUBZILLA_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
HUBZILLA_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
else
HUBZILLA_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
fi
if ! grep "# Hubzilla" /home/$MY_USERNAME/README; then if ! grep "# Hubzilla" /home/$MY_USERNAME/README; then
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README

8
src/freedombone-app-lychee
View File

@ -60,10 +60,10 @@ function lychee_create_database {
function_check get_mariadb_git_admin_password function_check get_mariadb_git_admin_password
get_mariadb_git_admin_password get_mariadb_git_admin_password
if [ ! ${GIT_ADMIN_PASSWORD} ]; then if [ -f ${IMAGE_PASSWORD_FILE} ]; then
if [ -f ${IMAGE_PASSWORD_FILE} ]; then GIT_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
GIT_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)" else
else if [ ! ${GIT_ADMIN_PASSWORD} ]; then
GIT_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})" GIT_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
fi fi
fi fi

8
src/freedombone-app-postactiv
View File

@ -159,10 +159,10 @@ function get_mariadb_postactiv_admin_password {
function postactiv_create_database { function postactiv_create_database {
function_check get_mariadb_postactiv_admin_password function_check get_mariadb_postactiv_admin_password
get_mariadb_postactiv_admin_password get_mariadb_postactiv_admin_password
if [ ! $POSTACTIV_ADMIN_PASSWORD ]; then if [ -f $IMAGE_PASSWORD_FILE ]; then
if [ -f $IMAGE_PASSWORD_FILE ]; then POSTACTIV_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
POSTACTIV_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)" else
else if [ ! $POSTACTIV_ADMIN_PASSWORD ]; then
POSTACTIV_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})" POSTACTIV_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
fi fi
fi fi

8
src/freedombone-app-rss
View File

@ -74,10 +74,10 @@ function get_mariadb_rss_admin_password {
function rss_create_database { function rss_create_database {
function_check get_mariadb_rss_admin_password function_check get_mariadb_rss_admin_password
get_mariadb_rss_admin_password get_mariadb_rss_admin_password
if [ ! $RSS_READER_ADMIN_PASSWORD ]; then if [ -f $IMAGE_PASSWORD_FILE ]; then
if [ -f $IMAGE_PASSWORD_FILE ]; then RSS_READER_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
RSS_READER_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)" else
else if [ ! $RSS_READER_ADMIN_PASSWORD ]; then
RSS_READER_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})" RSS_READER_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
fi fi
fi fi