From 37e9f37c461cc78e1c4500dc059c3a1f2c64c8c5 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Mon, 18 Dec 2017 07:37:08 -0500 Subject: [PATCH] fixed doc errors plus vm script mods revised the command reference for a couple text bugs that kevin noticed. new rolling file for setting apache2 environment variables; script to deploy still needed. mod to powerup to force permissions on app dir. good changes to revamp, now with some mysql powers. --- .../feisty_meow_command_reference.txt | 2 +- .../env_vars.001/env_vars_cakelampvm.conf | 17 ++++++++++++ scripts/site_avenger/powerup.sh | 21 ++++++++------- scripts/site_avenger/revamp_cakelampvm.sh | 27 +++++++++++++++++++ 4 files changed, 56 insertions(+), 11 deletions(-) create mode 100644 production/sites/cakelampvm.com/rolling/env_vars.001/env_vars_cakelampvm.conf diff --git a/documentation/feisty_meow_command_reference.txt b/documentation/feisty_meow_command_reference.txt index 75371b11..ebe9d02c 100644 --- a/documentation/feisty_meow_command_reference.txt +++ b/documentation/feisty_meow_command_reference.txt @@ -120,7 +120,7 @@ managing web sites. these scripts offer a lot of power to the developer, and of course that comes with great responsibility... the site avenger scripts are configured by "app" files stored in the "config" -directory (in $FEISTY_MEOW_SCRIPTS/scripts/site_avenger/config). the scripts +directory (in $FEISTY_MEOW_SCRIPTS/site_avenger/config). the scripts seek out a config file named after the application, e.g. they look for "winterportlibrary.app" if the application name is "winterportlibrary". the basic config file "default.app" is used for any application that is unknown diff --git a/production/sites/cakelampvm.com/rolling/env_vars.001/env_vars_cakelampvm.conf b/production/sites/cakelampvm.com/rolling/env_vars.001/env_vars_cakelampvm.conf new file mode 100644 index 00000000..3575476b --- /dev/null +++ b/production/sites/cakelampvm.com/rolling/env_vars.001/env_vars_cakelampvm.conf @@ -0,0 +1,17 @@ + +# these variables are global for all sites. +# you may want to override them in your specific site config file. + +SetEnv SSO_SANDBOX_USE_LOCAL 1 + +SetEnv SSO_SERVER_LOCAL_URL "http://accounts.local" + +SetEnv SSO_UNIVERSAL_SECRET "jimmydodad" + +SetEnv SSO_SERVER_LOOKUP_BROKER 0 + +SetEnv AVENGER_SANDBOX_MODE 1 + +SetEnv AVENGER_AIRPLANE_MODE 0 + + diff --git a/scripts/site_avenger/powerup.sh b/scripts/site_avenger/powerup.sh index c2ed28d5..ff2a9944 100644 --- a/scripts/site_avenger/powerup.sh +++ b/scripts/site_avenger/powerup.sh @@ -38,7 +38,6 @@ function print_instructions() echo "app dirname: The folder where the app will be stored." echo "repository: The name of the git repository (short version, no URL)." echo "theme name: The name to use for the cakephp theme." -# echo "user name: The name of the user to chown the checkout to." echo exit 0 } @@ -51,9 +50,6 @@ function print_instructions() app_dirname="$1"; shift repo_name="$1"; shift theme_name="$1"; shift -#user_name="$1"; shift - -#echo "*** user name is $user_name" if [ "$app_dirname" == "-help" -o "$app_dirname" == "--help" ]; then print_instructions @@ -107,12 +103,17 @@ create_site_links "$site_store_path" "$theme_name" sep -#if [ ! -z "$user_name" ]; then -# echo "Chowning the apps folder to be owned by: $user_name" -##hmmm: have to hope for now for standard group named after user -# chown -R "$user_name:$user_name" "$BASE_APPLICATION_PATH" -# test_or_die "Chowning $BASE_APPLICATION_PATH to be owned by $user_name" -#fi +# go with the default user running the script. +user_name=$USER +if [ ! -z "$user_name" -a "$user_name" != "root" ]; then + echo "Chowning the apps folder to be owned by: $user_name" +#hmmm: have to hope for now for standard group named after user + chown -R "$user_name:$user_name" "$BASE_APPLICATION_PATH" + test_or_die "Chowning $BASE_APPLICATION_PATH to be owned by $user_name" + +else +echo "user name failed checks for chowning, was '$user_name'" +fi sep diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh index a9016d8c..dd9ca882 100644 --- a/scripts/site_avenger/revamp_cakelampvm.sh +++ b/scripts/site_avenger/revamp_cakelampvm.sh @@ -20,6 +20,16 @@ source "$FEISTY_MEOW_SCRIPTS/system/common_sysadmin.sh" ############## +# new requirement is to get the sql root password, since we need to do some sql db configuration. +echo -n "Please enter the MySQL root account password: " +read mysql_passwd +if [ -z "$mysql_passwd" ]; then + echo "This script must have the sql root password to proceed." + exit 1 +fi + +############## + echo "Regenerating feisty meow loading dock." reconfigure_feisty_meow @@ -194,6 +204,23 @@ else echo successfully patched the samba configuration to enable writes on user home directories. way cool. fi +############## + +# set up some crucial users in the mysql db that we seem to have missed previously. + +mysql -u root -p "$mysql_passwd" <