From: Chris Koeritz Date: Mon, 9 Oct 2017 00:11:46 +0000 (-0400) Subject: cleanups to make system-wide install work X-Git-Tag: 2.140.90~150 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=d6775acfcf40fd3b3b19f836af2154f122b472ba;hp=a3759e3900ad41d74ad877973bbe371150ec6339;p=feisty_meow.git cleanups to make system-wide install work makes it so that the checkin commands operate as usual, even when feisty_meow is not located under one's home folder. also a new script for managing web permissions on our cake lamp vm we're building. --- diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh index b3119ae5..86cfe17b 100644 --- a/scripts/core/variables.sh +++ b/scripts/core/variables.sh @@ -207,7 +207,7 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then # names can be added in your customized scripts. the space at the end of # this variable is important and allows users to extend the list like: # define_yeti_variable REPOSITORY_DIR+="muppets configs" - define_yeti_variable REPOSITORY_LIST="feisty_meow " + define_yeti_variable REPOSITORY_LIST="$(basename $FEISTY_MEOW_APEX) " # initializes the feisty meow build variables, if possible. function initialize_build_variables() diff --git a/scripts/customize/fred/revamp_web_permissions.sh b/scripts/customize/fred/revamp_web_permissions.sh deleted file mode 100755 index af9693f0..00000000 --- a/scripts/customize/fred/revamp_web_permissions.sh +++ /dev/null @@ -1,21 +0,0 @@ - -# change the owner for the web roots to the apache user, www-data. -sudo chown -R www-data:www-data /var/www - -# make sure we have the appropriate access on a few key folders. -sudo chmod u+rwx,g+rx /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. - -# 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 - diff --git a/scripts/customize/fred/scripts/revamp_web_permissions.sh b/scripts/customize/fred/scripts/revamp_web_permissions.sh new file mode 100755 index 00000000..af9693f0 --- /dev/null +++ b/scripts/customize/fred/scripts/revamp_web_permissions.sh @@ -0,0 +1,21 @@ + +# change the owner for the web roots to the apache user, www-data. +sudo chown -R www-data:www-data /var/www + +# make sure we have the appropriate access on a few key folders. +sudo chmod u+rwx,g+rx /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. + +# 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 + diff --git a/scripts/rev_control/checkin.sh b/scripts/rev_control/checkin.sh index 76e0c7f0..0631e230 100644 --- a/scripts/rev_control/checkin.sh +++ b/scripts/rev_control/checkin.sh @@ -11,7 +11,7 @@ echo "committing repositories at: $(date)" if [ "$OS" != "Windows_NT" ]; then # first get individual folders. - checkin_list $HOME /usr/local + checkin_list $HOME $(dirname $FEISTY_MEOW_APEX) else checkin_list $HOME c:/ d:/ e:/ fi