From: Chris Koeritz Date: Tue, 19 Dec 2017 19:01:40 +0000 (-0500) Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev X-Git-Tag: 2.140.107^2~2^2~15 X-Git-Url: https://feistymeow.org/gitweb/?p=feisty_meow.git;a=commitdiff_plain;h=c606fc65e841709bd6e8c7a6e038a1b37f42c1d0;hp=5e6d01c9e7ec506826e75a3f3239ce4dfca734bc Merge branch 'dev' of feistymeow.org:feisty_meow into dev --- diff --git a/infobase/fortunes.dat b/infobase/fortunes.dat index 41f85f59..674d6289 100644 --- a/infobase/fortunes.dat +++ b/infobase/fortunes.dat @@ -43078,4 +43078,47 @@ our mind calm and relaxed, simply creates the right conditions to begin to connect with our Pristine Mind. --Excerpted from "Our Pristine Mind: A Practical Guide to Unconditional Happiness", by Orgyen Chowang, published by Shambhala Publications +~ +Some people think that causes are not necessary. They think that things do +not need causes and can exist without them. This is mistaken. Think about +it. If you plant a seed in a flowerpot, a flower will grow. It will not grow +from this table in front of me now. What is the reason for that? The causes +for a flower are present in a flowerpot, and for that reason a flower can grow +there. The causes for a flower are not present on the surface of this table, +and for that reason a flower cannot grow there. If things arose in the +absence of causes, a flower would have to be able to grow from the surface of +this table even though the causes for a flower are not present there. Or, as +we know, flowers bloom in the summer but not in the winter. What is the +reason for that? In the summer, the causes and conditions for the growth of +flowers are complete. In the winter, they are not. In dependence upon that, +flowers grow in the summer but not in the winter. If causes were not +necessary, flowers would grow in the winter also. They would grow at all +times. + -- Khenchen Thrangu, "Essential Practice: Lectures on Kamalashīla’s + Stages of Meditation in the Middle Way School", published by Shambhala + Publications +~ + Human beings have many kinds of suffering. Some human beings are put into +prisons. Some are destitute. Some are enslaved by others. Thus, they are +not actually hell-beings, but their sufferings are like those of hell-beings; +they are not actually hungry ghosts, but their sufferings are like those of +hungry ghosts; and they are not actually animals, but their sufferings are +like those of animals. We think in that way about the sufferings that human +beings experience. Some human beings are wealthy and comfortable. However, +that wealth and comfort does not last for a very long time. Not being able to +enjoy wealth and comfort for a long time, in the end suffering comes to them +too. When we think about the suffering that they experience, compassion +arises. + The demigods suffer from continual jealousy of and warfare with the gods +of the Desire Realm. As for the gods, though comfortable temporarily, later +they fall down into painful situations and, at the time of falling, they +suffer greatly. Similarly, even the gods of the Form Realm and the Formless +Realm cannot just stay there. They fall down to the states of hell-beings, +hungry ghosts, animals, humans, and so forth. When they fall, mentally they +suffer greatly. Therefore, sentient beings born in the states of the six +wanderers have nothing but suffering. If we think about that, compassion can +arise. +  -- Khenchen Thrangu, "Essential Practice: Lectures on Kamalashīla’s + Stages of Meditation in the Middle Way School", published by Shambhala + Publications diff --git a/production/feisty_meow_config.ini b/production/feisty_meow_config.ini index a8dca7ca..eec83fb4 100644 --- a/production/feisty_meow_config.ini +++ b/production/feisty_meow_config.ini @@ -3,7 +3,7 @@ # specifies the version of the code that is being constructed here. major=2 minor=140 -revision=105 +revision=106 build=420 # specifies the remainder of the version record info. diff --git a/scripts/core/common.alias b/scripts/core/common.alias index 87e47676..ba2e44be 100644 --- a/scripts/core/common.alias +++ b/scripts/core/common.alias @@ -58,6 +58,7 @@ define_yeti_alias fix_ssh_perms='chmod 700 $HOME/.ssh ; chmod 600 $HOME/.ssh/*' define_yeti_alias halt='sudo shutdown -h now' define_yeti_alias i=inventory define_yeti_alias l='perl $FEISTY_MEOW_SCRIPTS/files/summing_dir.pl' +define_yeti_alias ll='ls_dot_add=-a perl $FEISTY_MEOW_SCRIPTS/files/summing_dir.pl' define_yeti_alias ls='ls -HhFC $color_add' define_yeti_alias lsd='ls -hl' define_yeti_alias md='mkdir' diff --git a/scripts/customize/fred/scripts/archival/euphrosyne_comparator.sh b/scripts/customize/fred/scripts/archival/euphrosyne_comparator.sh index f3a7ab5a..1f7e731d 100644 --- a/scripts/customize/fred/scripts/archival/euphrosyne_comparator.sh +++ b/scripts/customize/fred/scripts/archival/euphrosyne_comparator.sh @@ -5,25 +5,26 @@ #hmmm: add a check that this is in fact the right host, euphrosyne. +target=wildmutt source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh" sep 14 echo "Comparing basement folder..." -compare_dirs /z/basement wildmutt:/z/basement +compare_dirs /z/basement ${target}:/z/basement sep 14 sep 14 echo "Comparing imaginations folder..." -compare_dirs /z/imaginations wildmutt:/z/imaginations +compare_dirs /z/imaginations ${target}:/z/imaginations sep 14 sep 14 echo "Comparing musix folder..." -compare_dirs /z/musix wildmutt:/z/musix +compare_dirs /z/musix ${target}:/z/musix sep 14 sep 14 echo "Comparing walrus folder..." -compare_dirs /z/walrus wildmutt:/z/walrus +compare_dirs /z/walrus ${target}:/z/walrus sep 14 diff --git a/scripts/files/summing_dir.pl b/scripts/files/summing_dir.pl index 10604659..82f4d29e 100644 --- a/scripts/files/summing_dir.pl +++ b/scripts/files/summing_dir.pl @@ -20,7 +20,7 @@ require "filename_helper.pl"; -use Env qw($TMP $color_add $TERM); +use Env qw($TMP $color_add $ls_dot_add $TERM); local($chewed_line) = ""; local(@arg_list); @@ -37,6 +37,8 @@ if ($#ARGV < 0) { @arg_list = &glob_list(@ARGV); } +# add parameters to our chewed_line, but skip items if they are flags we don't +# implement. foreach $dir (@arg_list) { if ($dir eq "-al") { next; } # skip ls directives. if ($dir eq "-l") { next; } # skip ls directives. @@ -56,8 +58,8 @@ chop($temp_file); # drop the main payload, the list of directory info, but also save that # info to a file for analysis. -system("ls -HhlF $color_add $chewed_line"); -system("ls -HhlF $color_add $chewed_line > $temp_file"); +system("ls -HhlF $ls_dot_add $color_add $chewed_line"); +system("ls -HhlF $ls_dot_add $color_add $chewed_line > $temp_file"); # the color_add variable, if defined, will have flags for setting the # directory listing color scheme. diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh index 8bd5eeee..2717b3a6 100644 --- a/scripts/site_avenger/revamp_cakelampvm.sh +++ b/scripts/site_avenger/revamp_cakelampvm.sh @@ -22,7 +22,12 @@ 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: " +# turn off echo but remember former setting. +stty_orig=`stty -g` +stty -echo read mysql_passwd +# turn echo back on. +stty $stty_orig if [ -z "$mysql_passwd" ]; then echo "This script must have the sql root password to proceed." exit 1 @@ -30,6 +35,8 @@ fi ############## +sep + echo "Regenerating feisty meow loading dock." reconfigure_feisty_meow @@ -39,6 +46,29 @@ test_or_die "fix after reconfigured as sudo" ############## +# set up some crucial users in the mysql db that we seem to have missed previously. + +sep + +echo "Adding users to the mysql database." + +#hmmm: good application for hiding output unless error here. +mysql -u root -p"$mysql_passwd" &>/dev/null < "/tmp/install_bluefish-$(logname).log" test_or_continue "installing bluefish editor" @@ -117,6 +151,9 @@ test_or_continue "installing bluefish editor" # which we've done as a prefix on the config for some reason. makes the # code below easy at least. if [ -L /etc/apache2/sites-enabled/000-default.conf ]; then + + sep + # the old site is in place still, so let's update that. echo "Updating default web sites to latest version." @@ -134,7 +171,7 @@ if [ -L /etc/apache2/sites-enabled/000-default.conf ]; then # copy in our new version of the default page. #hmmm: would be nice if this worked without mods for any new version, besides just 001. see apache env var file below for example implem. - cp -f $FEISTY_MEOW_APEX/production/sites/cakelampvm.com/rolling/default_page.001/* \ + \cp -f $FEISTY_MEOW_APEX/production/sites/cakelampvm.com/rolling/default_page.001/* \ /etc/apache2/sites-available test_or_die "installing new apache default sites" @@ -150,14 +187,16 @@ fi # fix up the apache site so that HSTS is disabled. otherwise we can't view # the https site for cakelampvm.com once the domain name switch has occurred. +sep + # we operate only on our own specialized tls conf file. hopefully no one has messed with it besides revamp. # note the use of the character class :blank: below to match spaces or tabs. search_replace "^[[:blank:]]*Header always set Strict-Transport-Security.*" "# not good for cakelampvm.com -- Header always set Strict-Transport-Security \"max-age=63072000; includeSubdomains;\"" /etc/apache2/conf-library/tls-enabling.conf if [ $? -ne 0 ]; then - echo the apache tls-enabling.conf file seems to have already been patched to disable strict transport security. good. + echo the apache tls-enabling.conf file seems to have already been patched to disable strict transport security. else restart_apache - echo successfully patched the apache tls-enabling.conf file to disable strict transport security. awesome. + echo successfully patched the apache tls-enabling.conf file to disable strict transport security. fi ############## @@ -166,73 +205,63 @@ fi # as being on the vm. this is already true for some specific sites, but we # want the wildcard enabled to ease the use of DNS for windows folks. +sep + grep -q "\*[[:blank:]]*IN A[[:blank:]]*10.28.42.20" /etc/bind/cakelampvm.com.conf if [ $? -eq 0 ]; then # already present. - echo the bind settings for wildcard domains off of cakelampvm.com seems to already be present. good deal. + echo the bind settings for wildcard domains off of cakelampvm.com seems to already be present. else echo " + + +;;;;;; + ; our bind magic, a wildcard domain, for all other sites with cakelampvm.com ; in the domain. this forces any other sites besides the ones above to route ; to the actual vm IP address, which currently is singular and very fixated. * IN A 10.28.42.20 - IN HINFO "linux vm" "ubuntu" -" >> /etc/bind/cakelampvm.com.conf - restart_bind - echo "successfully added wildcard domains to the cakelampvm.com bind configuration, so we're still on track for greatness." -fi + IN HINFO \"linux vm\" \"ubuntu\" -############## +;;;;;; -# fix samba configuration for (ass-headed) default of read-only in user homes. -# why add a necessary feature if you're just going to cripple it by default? -pattern="[#;][[:blank:]]*read only = yes" -replacement="read only = no" -# first see if we've already done this. -# if we find any occurrence of the replacement, we assume we already did it. -# ** we're assuming a lot about the structure of the samba config file! -grep -q "$replacement" /etc/samba/smb.conf  -if [ $? -ne 0 ]; then - echo "the samba configuration has already been fixed for user homes, s'cool." -else - # so not there yet; we need to make the replacement. - sed -i "0,/$pattern/{s/$pattern/$replacement/}" /etc/samba/smb.conf - test_or_die "patching samba configuration to enable write acccess on user home dirs" - # sweet, looks like that worked... - restart_samba - echo successfully patched the samba configuration to enable writes on user home directories. way cool. +" >> /etc/bind/cakelampvm.com.conf + restart_bind + echo "successfully added wildcard domains to the cakelampvm.com bind configuration." fi ############## -# set up some crucial users in the mysql db that we seem to have missed previously. +# fix samba configuration for (ass-headed) default of read-only in user homes. +# why cripple a necessary feature by default? -mysql -u root -p "$mysql_passwd" </dev/null # plug in the new version, just stomping anything there. # note: we only expect to have one version of the env_vars dir at a time in place in feisty... -cp -f $FEISTY_MEOW_APEX/production/sites/cakelampvm.com/rolling/env_vars.*/env_vars_cakelampvm.conf /etc/apache2/conf-available +\cp -f $FEISTY_MEOW_APEX/production/sites/cakelampvm.com/rolling/env_vars.*/env_vars_cakelampvm.conf /etc/apache2/conf-available test_or_die "copying environment variables file into place" # enable the new version of the config file. @@ -246,10 +275,8 @@ echo Successfully configured the apache2 environment variables needed for cakela # sequel--tell them they're great and show the hello again also. -echo " - +sep -" regenerate test_or_die "regenerating feisty meow scripts" chown -R "$(logname)":"$(logname)" /home/$(logname)/.[a-zA-Z0-9]*