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

Template changed for handling no web UI apps

This commit is contained in:
Bob Mottram 2018-04-08 15:56:54 +01:00
parent 466b5c023e
commit 2f379cdb67
1 changed files with 143 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

244
src/freedombone-template
View File

@ -291,16 +291,20 @@ echo '}'
echo '' echo ''
echo "function install_interactive_${app_name} {" echo "function install_interactive_${app_name} {"
if [ ! $app_onion_only ]; then if [ ! $app_onion_only ]; then
echo " if [ ! \"\$ONION_ONLY\" ]; then" if [ $app_webui ]; then
echo " ONION_ONLY='no'" echo " if [ ! \"\$ONION_ONLY\" ]; then"
echo ' fi' echo " ONION_ONLY='no'"
echo '' echo ' fi'
echo " if [[ \"\$ONION_ONLY\" != \"no\" ]]; then" echo ''
echo " ${app_name_upper}_DOMAIN_NAME='${app_name}.local'" echo " if [[ \"\$ONION_ONLY\" != \"no\" ]]; then"
echo " write_config_param \"${app_name_upper}_DOMAIN_NAME\" \"\$${app_name_upper}_DOMAIN_NAME\"" echo " ${app_name_upper}_DOMAIN_NAME='${app_name}.local'"
echo ' else' echo " write_config_param \"${app_name_upper}_DOMAIN_NAME\" \"\$${app_name_upper}_DOMAIN_NAME\""
echo " interactive_site_details \"${app_name}\" \"${app_name_upper}_DOMAIN_NAME\" \"${app_name_upper}_CODE\"" echo ' else'
echo ' fi' echo " interactive_site_details \"${app_name}\" \"${app_name_upper}_DOMAIN_NAME\" \"${app_name_upper}_CODE\""
echo ' fi'
else
echo " echo -n ''"
fi
else else
echo " echo -n ''" echo " echo -n ''"
fi fi
@ -310,8 +314,10 @@ echo ''
echo "function change_password_${app_name} {" echo "function change_password_${app_name} {"
echo " curr_username=\"\$1\"" echo " curr_username=\"\$1\""
echo " new_user_password=\"\$2\"" echo " new_user_password=\"\$2\""
echo '' if [ $app_webui ]; then
echo " read_config_param '${app_name_upper}_DOMAIN_NAME'" echo ''
echo " read_config_param '${app_name_upper}_DOMAIN_NAME'"
fi
echo '' echo ''
echo " \"\${PROJECT_NAME}-pass\" -u \"\$curr_username\" -a ${app_name} -p \"\$new_user_password\"" echo " \"\${PROJECT_NAME}-pass\" -u \"\$curr_username\" -a ${app_name} -p \"\$new_user_password\""
echo '}' echo '}'
@ -381,10 +387,12 @@ echo " CURR_${app_name_upper}_COMMIT=\$(get_completion_param \"${app_name} co
echo " if [[ \"\$CURR_${app_name_upper}_COMMIT\" == \"\$${app_name_upper}_COMMIT\" ]]; then" echo " if [[ \"\$CURR_${app_name_upper}_COMMIT\" == \"\$${app_name_upper}_COMMIT\" ]]; then"
echo ' return' echo ' return'
echo ' fi' echo ' fi'
echo '' if [ $app_webui ]; then
echo " if grep -q \"${app_name} domain\" \"\$COMPLETION_FILE\"; then" echo ''
echo " ${app_name_upper}_DOMAIN_NAME=\$(get_completion_param \"${app_name} domain\")" echo " if grep -q \"${app_name} domain\" \"\$COMPLETION_FILE\"; then"
echo ' fi' echo " ${app_name_upper}_DOMAIN_NAME=\$(get_completion_param \"${app_name} domain\")"
echo ' fi'
fi
echo '' echo ''
echo ' # update to the next commit' echo ' # update to the next commit'
if [ ! "$app_dir" ]; then if [ ! "$app_dir" ]; then
@ -407,8 +415,10 @@ if [ ! "$app_dir" ]; then
else else
echo " source_directory=${app_dir}" echo " source_directory=${app_dir}"
fi fi
echo '' if [ $app_webui ]; then
echo " suspend_site \"\${${app_name_upper}_DOMAIN_NAME}\"" echo ''
echo " suspend_site \"\${${app_name_upper}_DOMAIN_NAME}\""
fi
echo '' echo ''
echo " dest_directory=${app_name}" echo " dest_directory=${app_name}"
echo " backup_directory_to_usb \"\$source_directory\" \$dest_directory" echo " backup_directory_to_usb \"\$source_directory\" \$dest_directory"
@ -422,55 +432,63 @@ if [[ "$database_type" == "postgres"* ]]; then
echo " backup_database_to_usb ${app_name}" echo " backup_database_to_usb ${app_name}"
echo '' echo ''
fi fi
echo ' restart_site' if [ $app_webui ]; then
echo ' restart_site'
fi
echo '}' echo '}'
echo '' echo ''
echo "function restore_local_${app_name} {" echo "function restore_local_${app_name} {"
echo " if ! grep -q \"${app_name} domain\" \"\$COMPLETION_FILE\"; then" echo " if ! grep -q \"${app_name} domain\" \"\$COMPLETION_FILE\"; then"
echo ' return' echo ' return'
echo ' fi' echo ' fi'
echo " ${app_name_upper}_DOMAIN_NAME=\$(get_completion_param \"${app_name} domain\")" if [ $app_webui ]; then
echo " if [ \"\$${app_name_upper}_DOMAIN_NAME\" ]; then" echo " ${app_name_upper}_DOMAIN_NAME=\$(get_completion_param \"${app_name} domain\")"
echo " temp_restore_dir=/root/temp${app_name}" echo " if [ ! \"\$${app_name_upper}_DOMAIN_NAME\" ]; then"
echo " return"
echo " fi"
fi
echo " temp_restore_dir=/root/temp${app_name}"
if [ ! "$app_dir" ]; then if [ ! "$app_dir" ]; then
echo " ${app_name}_dir=/var/www/\${${app_name_upper}_DOMAIN_NAME}/htdocs" echo " ${app_name}_dir=/var/www/\${${app_name_upper}_DOMAIN_NAME}/htdocs"
else else
echo " ${app_name}_dir=${app_dir}" echo " ${app_name}_dir=${app_dir}"
fi fi
echo '' echo ''
if [[ "$database_type" == "mariadb" || "$database_type" == "mysql" ]]; then if [[ "$database_type" == "mariadb" || "$database_type" == "mysql" ]]; then
echo " ${app_name}_create_database" echo " ${app_name}_create_database"
echo '' echo ''
echo " restore_database ${app_name}" echo " restore_database ${app_name}"
echo " if [ -d \$temp_restore_dir ]; then" echo " if [ -d \$temp_restore_dir ]; then"
echo " rm -rf \$temp_restore_dir" echo " rm -rf \$temp_restore_dir"
echo ' fi' echo ' fi'
echo '' echo ''
fi fi
if [[ "$database_type" == "postgres"* ]]; then if [[ "$database_type" == "postgres"* ]]; then
echo " ${app_name}_create_database" echo " ${app_name}_create_database"
echo '' echo ''
echo ' USE_POSTGRESQL=1' echo ' USE_POSTGRESQL=1'
echo " restore_database ${app_name}" echo " restore_database ${app_name}"
echo " if [ -d \$temp_restore_dir ]; then" echo " if [ -d \$temp_restore_dir ]; then"
echo " rm -rf \$temp_restore_dir" echo " rm -rf \$temp_restore_dir"
echo ' fi' echo ' fi'
echo '' echo ''
fi fi
echo " restore_directory_from_usb \$temp_restore_dir ${app_name}" echo " restore_directory_from_usb \$temp_restore_dir ${app_name}"
echo " if [ -d \$temp_restore_dir ]; then" echo " if [ -d \$temp_restore_dir ]; then"
echo " if [ -d \"\$temp_restore_dir\$${app_name}_dir\" ]; then" echo " if [ -d \"\$temp_restore_dir\$${app_name}_dir\" ]; then"
echo " cp -rp \"\$temp_restore_dir\$${app_name}_dir\"/* \"\$${app_name}_dir\"/" echo " cp -rp \"\$temp_restore_dir\$${app_name}_dir\"/* \"\$${app_name}_dir\"/"
echo ' else' echo ' else'
echo " if [ ! -d \"\$${app_name}_dir\" ]; then" echo " if [ ! -d \"\$${app_name}_dir\" ]; then"
echo " mkdir \"\$${app_name}_dir\"" echo " mkdir \"\$${app_name}_dir\""
echo ' fi'
echo " cp -rp \"\$temp_restore_dir\"/* \"\$${app_name}_dir\"/"
echo ' fi' echo ' fi'
echo " chown -R www-data:www-data \"\$${app_name}_dir\"" echo " cp -rp \"\$temp_restore_dir\"/* \"\$${app_name}_dir\"/"
echo " rm -rf \$temp_restore_dir"
echo ' fi' echo ' fi'
echo '' if [[ ! "$app_dir" ]]; then
echo " chown -R www-data:www-data \"\$${app_name}_dir\""
else
echo " chown -R ${app_name}:${app_name} \"\$${app_name}_dir\""
fi
echo " rm -rf \$temp_restore_dir"
echo ' fi' echo ' fi'
echo '}' echo '}'
echo '' echo ''
@ -485,8 +503,10 @@ if [ ! "$app_dir" ]; then
else else
echo " source_directory=${app_dir}" echo " source_directory=${app_dir}"
fi fi
echo '' if [ $app_webui ]; then
echo " suspend_site \"\${${app_name_upper}_DOMAIN_NAME}\"" echo ''
echo " suspend_site \"\${${app_name_upper}_DOMAIN_NAME}\""
fi
echo '' echo ''
echo " dest_directory=${app_name}" echo " dest_directory=${app_name}"
echo " backup_directory_to_friend \"\$source_directory\" \$dest_directory" echo " backup_directory_to_friend \"\$source_directory\" \$dest_directory"
@ -499,8 +519,10 @@ if [[ "$database_type" == "postgres"* ]]; then
echo " backup_database_to_friend ${app_name}" echo " backup_database_to_friend ${app_name}"
echo '' echo ''
fi fi
echo '' if [ $app_webui ]; then
echo ' restart_site' echo ''
echo ' restart_site'
fi
echo '}' echo '}'
echo '' echo ''
echo "function restore_remote_${app_name} {" echo "function restore_remote_${app_name} {"
@ -508,47 +530,51 @@ echo " if ! grep -q \"${app_name} domain\" \"\$COMPLETION_FILE\"; then"
echo ' return' echo ' return'
echo ' fi' echo ' fi'
echo " ${app_name_upper}_DOMAIN_NAME=\$(get_completion_param \"${app_name} domain\")" echo " ${app_name_upper}_DOMAIN_NAME=\$(get_completion_param \"${app_name} domain\")"
echo " if [ \"\$${app_name_upper}_DOMAIN_NAME\" ]; then" echo " if [ ! \"\$${app_name_upper}_DOMAIN_NAME\" ]; then"
echo " temp_restore_dir=/root/temp${app_name}" echo " return"
echo " fi"
echo " temp_restore_dir=/root/temp${app_name}"
if [ ! "$app_dir" ]; then if [ ! "$app_dir" ]; then
echo " ${app_name}_dir=/var/www/\${${app_name_upper}_DOMAIN_NAME}/htdocs" echo " ${app_name}_dir=/var/www/\${${app_name_upper}_DOMAIN_NAME}/htdocs"
else else
echo " ${app_name}_dir=${app_dir}" echo " ${app_name}_dir=${app_dir}"
fi fi
echo '' echo ''
if [[ "$database_type" == "mariadb" || "$database_type" == "mysql" ]]; then if [[ "$database_type" == "mariadb" || "$database_type" == "mysql" ]]; then
echo " ${app_name}_create_database" echo " ${app_name}_create_database"
echo '' echo ''
echo " restore_database_from_friend ${app_name}" echo " restore_database_from_friend ${app_name}"
echo " if [ -d \"\$temp_restore_dir\" ]; then" echo " if [ -d \"\$temp_restore_dir\" ]; then"
echo " rm -rf \$temp_restore_dir" echo " rm -rf \$temp_restore_dir"
echo ' fi' echo ' fi'
echo '' echo ''
fi fi
if [[ "$database_type" == "postgres"* ]]; then if [[ "$database_type" == "postgres"* ]]; then
echo " ${app_name}_create_database" echo " ${app_name}_create_database"
echo '' echo ''
echo ' USE_POSTGRESQL=1' echo ' USE_POSTGRESQL=1'
echo " restore_database_from_friend ${app_name}" echo " restore_database_from_friend ${app_name}"
echo " if [ -d \"\$temp_restore_dir\" ]; then" echo " if [ -d \"\$temp_restore_dir\" ]; then"
echo " rm -rf \$temp_restore_dir" echo " rm -rf \$temp_restore_dir"
echo ' fi' echo ' fi'
echo '' echo ''
fi fi
echo " restore_directory_from_friend \$temp_restore_dir ${app_name}" echo " restore_directory_from_friend \$temp_restore_dir ${app_name}"
echo " if [ -d \$temp_restore_dir ]; then" echo " if [ -d \$temp_restore_dir ]; then"
echo " if [ -d \"\$temp_restore_dir\$${app_name}_dir\" ]; then" echo " if [ -d \"\$temp_restore_dir\$${app_name}_dir\" ]; then"
echo " cp -rp \"\$temp_restore_dir\$${app_name}_dir\"/* \"\$${app_name}_dir\"/" echo " cp -rp \"\$temp_restore_dir\$${app_name}_dir\"/* \"\$${app_name}_dir\"/"
echo ' else' echo ' else'
echo " if [ ! -d \"\$${app_name}_dir\" ]; then" echo " if [ ! -d \"\$${app_name}_dir\" ]; then"
echo " mkdir \"\$${app_name}_dir\"" echo " mkdir \"\$${app_name}_dir\""
echo ' fi'
echo " cp -rp \$temp_restore_dir/* \"\$${app_name}_dir\"/"
echo ' fi' echo ' fi'
echo " chown -R www-data:www-data \"\$${app_name}_dir\"" echo " cp -rp \$temp_restore_dir/* \"\$${app_name}_dir\"/"
echo " rm -rf \$temp_restore_dir"
echo ' fi' echo ' fi'
echo '' if [[ ! "$app_dir" ]]; then
echo " chown -R www-data:www-data \"\$${app_name}_dir\""
else
echo " chown -R ${app_name}:${app_name} \"\$${app_name}_dir\""
fi
echo " rm -rf \$temp_restore_dir"
echo ' fi' echo ' fi'
echo '}' echo '}'
echo '' echo ''
@ -568,13 +594,15 @@ if [ $app_daemon ]; then
echo ' fi' echo ' fi'
echo " userdel -r ${app_name}" echo " userdel -r ${app_name}"
fi fi
echo '' if [ $app_webui ]; then
echo " if [ -d \"/var/www/\$${app_name_upper}_DOMAIN_NAME\" ]; then" echo ''
echo " rm -rf \"/var/www/\$${app_name_upper}_DOMAIN_NAME\"" echo " if [ -d \"/var/www/\$${app_name_upper}_DOMAIN_NAME\" ]; then"
echo ' fi' echo " rm -rf \"/var/www/\$${app_name_upper}_DOMAIN_NAME\""
echo " if [ -f \"/etc/nginx/sites-available/\$${app_name_upper}_DOMAIN_NAME\" ]; then" echo ' fi'
echo " rm \"/etc/nginx/sites-available/\$${app_name_upper}_DOMAIN_NAME\"" echo " if [ -f \"/etc/nginx/sites-available/\$${app_name_upper}_DOMAIN_NAME\" ]; then"
echo ' fi' echo " rm \"/etc/nginx/sites-available/\$${app_name_upper}_DOMAIN_NAME\""
echo ' fi'
fi
if [[ "$database_type" == "mariadb" || "$database_type" == "mysql" ]]; then if [[ "$database_type" == "mariadb" || "$database_type" == "mysql" ]]; then
echo " drop_database ${app_name}" echo " drop_database ${app_name}"
fi fi
@ -592,8 +620,10 @@ if [ "$app_port" ]; then
echo '' echo ''
echo " firewall_remove ${app_port} tcp" echo " firewall_remove ${app_port} tcp"
fi fi
echo '' if [ $app_webui ]; then
echo " remove_ddns_domain \"\$${app_name_upper}_DOMAIN_NAME\"" echo ''
echo " remove_ddns_domain \"\$${app_name_upper}_DOMAIN_NAME\""
fi
echo '}' echo '}'
echo '' echo ''
echo "function install_${app_name} {" echo "function install_${app_name} {"
@ -632,7 +662,9 @@ if [ $app_webui ]; then
fi fi
echo " if [ -d /repos/${app_name} ]; then" echo " if [ -d /repos/${app_name} ]; then"
echo " mkdir \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\"" if [ $app_webui ]; then
echo " mkdir \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\""
fi
if [ ! "$app_dir" ]; then if [ ! "$app_dir" ]; then
echo " cp -r -p /repos/${app_name}/. \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\"" echo " cp -r -p /repos/${app_name}/. \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\""
echo " cd \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\" || exit 324687356" echo " cd \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\" || exit 324687356"
@ -665,16 +697,20 @@ else
fi fi
echo " git checkout \$${app_name_upper}_COMMIT -b \$${app_name_upper}_COMMIT" echo " git checkout \$${app_name_upper}_COMMIT -b \$${app_name_upper}_COMMIT"
echo " set_completion_param \"${app_name} commit\" \"\$${app_name_upper}_COMMIT\"" echo " set_completion_param \"${app_name} commit\" \"\$${app_name_upper}_COMMIT\""
echo '' if [ $app_webui ]; then
echo " chmod g+w \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\"" echo ''
echo " chown -R www-data:www-data \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\"" echo " chmod g+w \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\""
echo " chown -R www-data:www-data \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\""
fi
if [[ "$database_type" == "mariadb" || "$database_type" == "mysql" || "$database_type" == "postgres"* ]]; then if [[ "$database_type" == "mariadb" || "$database_type" == "mysql" || "$database_type" == "postgres"* ]]; then
echo '' echo ''
echo " ${app_name}_create_database" echo " ${app_name}_create_database"
fi fi
echo '' if [ $app_webui ]; then
echo " add_ddns_domain \"\$${app_name_upper}_DOMAIN_NAME\"" echo ''
echo " add_ddns_domain \"\$${app_name_upper}_DOMAIN_NAME\""
fi
echo '' echo ''
echo " ${app_name_upper}_ONION_HOSTNAME=\$(add_onion_service ${app_name} 80 \${${app_name_upper}_ONION_PORT})" echo " ${app_name_upper}_ONION_HOSTNAME=\$(add_onion_service ${app_name} 80 \${${app_name_upper}_ONION_PORT})"
@ -819,18 +855,24 @@ if [ $app_daemon ]; then
fi fi
echo " systemctl start ${app_name}" echo " systemctl start ${app_name}"
fi fi
echo '' if [ $app_webui ]; then
echo " create_site_certificate \"\$${app_name_upper}_DOMAIN_NAME\" 'yes'" echo ''
echo '' echo " create_site_certificate \"\$${app_name_upper}_DOMAIN_NAME\" 'yes'"
echo " nginx_ensite \"\$${app_name_upper}_DOMAIN_NAME\"" echo ''
echo '' echo " nginx_ensite \"\$${app_name_upper}_DOMAIN_NAME\""
fi
if [[ "$database_type" == "mariadb" || "$database_type" == "mysql" ]]; then if [[ "$database_type" == "mariadb" || "$database_type" == "mysql" ]]; then
echo ''
echo ' systemctl restart mariadb' echo ' systemctl restart mariadb'
fi fi
if [[ "$app_php" == 'yes' ]]; then if [ $app_webui ]; then
echo ' systemctl restart php7.0-fpm' if [[ "$app_php" == 'yes' ]]; then
echo ''
echo ' systemctl restart php7.0-fpm'
fi
echo ''
echo ' systemctl restart nginx'
fi fi
echo ' systemctl restart nginx'
echo '' echo ''
echo " \"\${PROJECT_NAME}-pass\" -u \"\$MY_USERNAME\" -a ${app_name} -p \"\$${app_name_upper}_ADMIN_PASSWORD\"" echo " \"\${PROJECT_NAME}-pass\" -u \"\$MY_USERNAME\" -a ${app_name} -p \"\$${app_name_upper}_ADMIN_PASSWORD\""
echo " set_completion_param \"${app_name} domain\" \"\$${app_name_upper}_DOMAIN_NAME\"" echo " set_completion_param \"${app_name} domain\" \"\$${app_name_upper}_DOMAIN_NAME\""