From: Chris Koeritz Date: Sun, 12 Nov 2017 03:48:53 +0000 (-0500) Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev X-Git-Tag: 2.140.98^2~27^2~3 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=491bfd133c33e140bfb93ac47656bf429af42e2e;hp=a494051e475af89cec61e8d854fb63fc8dc2c4cb;p=feisty_meow.git Merge branch 'dev' of feistymeow.org:feisty_meow into dev --- diff --git a/scripts/core/common.alias b/scripts/core/common.alias index e311dc28..9d4049e5 100644 --- a/scripts/core/common.alias +++ b/scripts/core/common.alias @@ -85,6 +85,15 @@ define_yeti_alias feisty_branch='pushd $FEISTY_MEOW_APEX ; git branch ; popd' ############## +# some important retreads on aliases that provide a sudo-ized version of other scripts. + +define_yeti_alias standup="bash \"$FEISTY_MEOW_SCRIPTS/site_avenger/standup.sh\"" + +#hmmm: some magma intrusions from the fred customizations... +define_yeti_alias revamp_web_permissions="bash \"$FEISTY_MEOW_SCRIPTS/customize/fred/scripts/cakelampvm/revamp_web_permissions.sh" + +############## + # extended aliases for meta-operations. define_yeti_alias dvd_rip='vobcopy -m' define_yeti_alias blu_rip='echo "what would this command be?"' diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index 9dcfce80..67977085 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -363,14 +363,15 @@ if [ -z "$skip_all" ]; then # sudo function wraps the normal sudo by ensuring we replace the terminal # label if they're doing an su with the sudo. function sudo() { -# local first_command="$1" save_terminal_title /usr/bin/sudo "$@" + retval=$? restore_terminal_title # if [ "$first_command" == "su" ]; then # # yep, they were doing an su, but they're back now. # label_terminal_with_info # fi + return $retval } # trashes the .#blah files that cvs and subversion leave behind when finding conflicts. diff --git a/scripts/customize/fred/refred.sh b/scripts/customize/fred/refred.sh index 2f00854a..c99b2d11 100644 --- a/scripts/customize/fred/refred.sh +++ b/scripts/customize/fred/refred.sh @@ -19,30 +19,41 @@ function refred() # everything else is only re-permed if it exists. if [ ! -d "$DEFAULT_FEISTYMEOW_ORG_DIR" ]; then sudo mkdir "$DEFAULT_FEISTYMEOW_ORG_DIR" + test_or_die "making directory: $DEFAULT_FEISTYMEOW_ORG_DIR" fi # iterate across the list of dirs we want fred to own and change their ownership. for dirname in /home/fred $DEFAULT_FEISTYMEOW_ORG_DIR /usr/local/fred /home/games $arch_addin; do if [ -d "$dirname" ]; then echo "refred on '$dirname'" - sudo chown -R fred:fred $dirname + sudo chown -R fred:fred "$dirname" + test_or_die "chowning for fred: $dirname" fi done # special case for archives directory. if [ -d /z/stuffing -o -L /z/stuffing ]; then - sudo chown fred:fred /z; sudo chmod g+rx,o+rx /z - sudo chown fred:fred /z/stuffing; sudo chmod g+rx,o-rwx /z/stuffing + sudo chown fred:fred /z + test_or_die "chowning /z for fred" + sudo chmod g+rx,o+rx /z + test_or_die "chmodding /z/ for fred" + sudo chown fred:fred /z/stuffing + test_or_die "chowning /z/stuffing for fred" + sudo chmod g+rx,o-rwx /z/stuffing + test_or_die "chmodding /z/stuffing for fred" pushd /z/stuffing &>/dev/null if [ -d archives -o -L archives ]; then sudo chown fred:fred archives + test_or_die "chowning /z/stuffing/archives for fred" sudo chmod -R g+rwx archives + test_or_die "chmodding /z/stuffing/archives for fred" fi popd &>/dev/null fi # make the logs readable by normal humans. sudo bash $FEISTY_MEOW_SCRIPTS/security/normal_perm.sh /var/log + test_or_die "setting normal perms on /var/log" } # this block should execute when the script is actually run, rather @@ -50,6 +61,8 @@ function refred() if [[ $0 =~ .*refred\.sh.* ]]; then THISDIR="$( \cd "$(\dirname "$0")" && /bin/pwd )" source "$THISDIR/../../core/launch_feisty_meow.sh" + test_or_die "sourcing the feisty meow launcher" refred + test_or_die "refredding process" fi diff --git a/scripts/customize/fred/scripts/cakelampvm/revamp_web_permissions.sh b/scripts/customize/fred/scripts/cakelampvm/revamp_web_permissions.sh index af9693f0..f474b2da 100755 --- a/scripts/customize/fred/scripts/cakelampvm/revamp_web_permissions.sh +++ b/scripts/customize/fred/scripts/cakelampvm/revamp_web_permissions.sh @@ -1,21 +1,42 @@ -# change the owner for the web roots to the apache user, www-data. -sudo chown -R www-data:www-data /var/www +# fixes the cakelampvm permissions according to the way. + +source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh" + +############## + +if (( $EUID != 0 )); then + echo "This script must be run as root or sudo." + exit 1 +fi + +############## # make sure we have the appropriate access on a few key folders. -sudo chmod u+rwx,g+rx /var/www +normal_perm /var/www + +############## + +# change the owner for the web roots to the apache user, www-data. +sudo chown -R www-data:www-data /var/www # put a couple specific ownerships into play so the appropriate user has full access. -sudo chown -R developer:developer /var/www/defaultcake.cakelampvm.com -sudo chown -R fred:fred /var/www/webwork.repository -## add others here for your own projects. +sudo chown -R developer:developer /home/developer \ + /etc/apache2 \ + /etc/bind \ -# these directories will be given group permissons that enable web server access. -DIR_LIST="/var/www/defaultcake.cakelampvm.com /var/www/webwork.repository" -# add in group permissions to allow the web server to serve the pages properly. -for currdir in $DIR_LIST; do - sudo find $currdir -type d -exec chmod -R u+rwx,g+rwx,o-rwx {} ';' - sudo find $currdir -type f -exec chmod -R u+rw,g+rw,o-rwx {} ';' -done +sudo chown -R fred:fred /home/fred \ + /opt/feistymeow.org \ + /home/archives/stuffing \ + + +############## + +# these directories will be given group permissons that enable web server access. +group_perm /var/www/html \ + /opt/feistymeow.org \ + /etc/apache \ + / +##############