X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;ds=inline;f=scripts%2Fsite_avenger%2Fshared_site_mgr.sh;h=6f731e6937a3158e83e4b994306ea985e366a2cb;hb=0429ffb00a3f48ad1a6cb987d483609fe76c1a97;hp=3c03ccbe6002aeb52223f952b8150b83f1bc471d;hpb=51d8b4e834cb9363728cd73f15162304e2f15061;p=feisty_meow.git diff --git a/scripts/site_avenger/shared_site_mgr.sh b/scripts/site_avenger/shared_site_mgr.sh index 3c03ccbe..6f731e69 100644 --- a/scripts/site_avenger/shared_site_mgr.sh +++ b/scripts/site_avenger/shared_site_mgr.sh @@ -16,6 +16,8 @@ source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh" export SITE_MANAGEMENT_CONFIG_FILE if [ -z "$SITE_MANAGEMENT_CONFIG_FILE" ]; then SITE_MANAGEMENT_CONFIG_FILE="$WORKDIR/config/default.app" + echo "Site management config file was not set. Using default:" + echo " $SITE_MANAGEMENT_CONFIG_FILE" fi # load in at least the default version to get us moving. @@ -36,6 +38,33 @@ function check_application_dir() fi } +# tries to find an appropriate config file for the application. +function locate_config_file() +{ + local app_dirname="$1"; shift + + local configfile="$WORKDIR/config/${app_dirname}.app" + echo "config file?: $configfile" + if [ ! -f "$configfile" ]; then + # this is not a good config file. we can't auto-guess the config. + echo -e " +There is no specific site configuration file in: + $configfile +We will continue onward using the default and hope that this project follows +the standard pattern for cakephp projects." + # we'll pull in the default config file we set earlier; this will + # reinitialize some variables based on the app name. + else + # they gave us a valid config file. let's try using it. + export SITE_MANAGEMENT_CONFIG_FILE="$configfile" + fi + + # try to load the config. + source "$SITE_MANAGEMENT_CONFIG_FILE" + test_or_die "loading site management configuration from: $SITE_MANAGEMENT_CONFIG_FILE" + +} + # this function will seek out top-level directories in the target directory passed in. # if there is only one directory, then it is returned (in the app_dirname variable). # otherwise, the user is asked which directory to use. @@ -86,25 +115,6 @@ function find_app_folder() test_or_die "Testing application folder: $app_dirname" echo "Application folder is: $app_dirname" - - local configfile="$WORKDIR/config/${app_dirname}.app" - if [ ! -f "$configfile" ]; then - # this is not a good config file. we can't auto-guess the config. - echo -e " -There is no specific site configuration file in: - $configfile -We will continue onward using the default and hope that this project follows -the standard pattern for cakephp projects." - # we'll pull in the default config file we set earlier; this will - # reinitialize some variables based on the app name. - else - # they gave us a valid config file. let's try using it. - SITE_MANAGEMENT_CONFIG_FILE="$configfile" - fi - - # try to load the config. - source "$SITE_MANAGEMENT_CONFIG_FILE" - test_or_die "loading site management configuration from: $SITE_MANAGEMENT_CONFIG_FILE" } # ensures that the app directory name is valid. @@ -120,25 +130,29 @@ function test_app_folder() mkdir "$combo" test_or_die "Making application directory when not already present" fi + + locate_config_file "$dir" } # eases some permissions to enable apache to write log files and do other shopkeeping. function fix_site_perms() { - local site_dir="$1"; shift + local app_dir="$1"; shift + + local site_dir="$app_dir/$CHECKOUT_DIR_NAME" if [ -f "$site_dir/bin/cake" ]; then - chmod -R a+rx "$site_dir/bin/cake" + sudo chmod -R a+rx "$site_dir/bin/cake" test_or_die "Enabling execute bit on cake binary" fi if [ -d "$site_dir/logs" ]; then - chmod -R g+w "$site_dir/logs" + sudo chmod -R g+w "$site_dir/logs" test_or_die "Enabling group write on site's Logs directory" fi if [ -d "$site_dir/tmp" ]; then - chmod -R g+w "$site_dir/tmp" + sudo chmod -R g+w "$site_dir/tmp" test_or_die "Enabling group write on site's tmp directory" fi } @@ -178,12 +192,10 @@ var full_app_dir checkout_dirname repo_root repo_name local complete_path="$full_app_dir/$checkout_dirname" -echo A # see if the checkout directory exits. the repo_found variable is set to # non-empty if we find it and it's a valid git repo. repo_found= if [ -d "$checkout_dirname" ]; then -echo B # checkout directory exists, so let's check it. pushd "$checkout_dirname" &>/dev/null test_or_die "Switching to our checkout directory: $checkout_dirname" @@ -194,7 +206,6 @@ echo B repo_found=yes fi -echo C # we don't consider the state of having the dir exist but the repo be wrong as good. if [ -z "$repo_found" ]; then echo "There is a problem; this folder is not a valid repository:" @@ -205,24 +216,22 @@ echo C popd &>/dev/null fi -echo D if [ ! -z "$repo_found" ]; then # a repository was found, so update the version here and leave. -echo E echo "Repository $repo_name exists. Updating it." rgetem test_or_die "Recursive checkout on: $complete_path" else -echo F # clone the repo since it wasn't found. echo "Cloning repository $repo_name now." git clone "$repo_root/$repo_name.git" $checkout_dirname test_or_die "Git clone of repository: $repo_name" fi -echo G - fix_site_perms "$complete_path" +#not doing this here since powerup uses this and has no sudo. + #fix_site_perms "$complete_path" +#unused? # construct the full path to where the app will actually live. site_store_path="$complete_path" @@ -346,4 +355,53 @@ function update_composer_repository() fi } +# fixes the ownership for a site avenger or php application. +# this almost certainly will require sudo capability, if there are any ownership problems +# that need to be resolved. +function fix_appdir_ownership() +{ + local appsdir="$1"; shift + local dir="$1"; shift + + local combo="$appsdir/$dir" + + # go with the default user running the script. + user_name="$USER" + if [ ! -z "$user_name" -a "$user_name" != "root" ]; then + echo "Chowning the app folder to be owned by: $user_name" +#hmmm: have to hope for now for standard group named after user + sudo chown -R "$user_name:$user_name" "$combo" + test_or_die "Chowning $combo to be owned by $user_name" + else + echo "user name failed checks for chowning, was found as '$user_name'" + fi + + # +#probably not enough for path! + fix_site_perms "$combo" +} + +# Jumps to an application directory given the app name. If no app name is +# given, it will show a menu to pick the app. +function switch_to() +{ + # check for parameters. + app_dirname="$1"; shift + + check_application_dir "$BASE_APPLICATION_PATH" + + # find proper webroot where the site will be initialized. + if [ -z "$app_dirname" ]; then + # no dir was passed, so guess it. + find_app_folder "$BASE_APPLICATION_PATH" + else + test_app_folder "$BASE_APPLICATION_PATH" "$app_dirname" + fi + + # where we expect to find our checkout folder underneath. + full_app_dir="$BASE_APPLICATION_PATH/$app_dirname" + + cd $full_app_dir/$CHECKOUT_DIR_NAME + pwd +}