From: Chris Koeritz <fred@gruntose.com>
Date: Sun, 19 Nov 2017 14:14:41 +0000 (-0500)
Subject: Merge branch 'release-2.140.102'
X-Git-Tag: 2.140.102^0
X-Git-Url: https://feistymeow.org/gitweb/?p=feisty_meow.git;a=commitdiff_plain;h=b2d6b44040e07cb085727979e27286cf12275de1;hp=f119550584610cab4d5005eb13cb97bebfef68e7

Merge branch 'release-2.140.102'

bringing in recent revamp updates
---

diff --git a/production/feisty_meow_config.ini b/production/feisty_meow_config.ini
index 9ebbd74e..e11b6d7a 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=101
+revision=102
 build=420
 
 # specifies the remainder of the version record info.
diff --git a/production/sites/cakelampvm.com/.gitignore b/production/sites/cakelampvm.com/.gitignore
new file mode 100644
index 00000000..114c7637
--- /dev/null
+++ b/production/sites/cakelampvm.com/.gitignore
@@ -0,0 +1 @@
+google*.html
diff --git a/production/sites/cakelampvm.com/hello.txt b/production/sites/cakelampvm.com/hello.txt
index 7bf0d1b8..f430c4fb 100644
--- a/production/sites/cakelampvm.com/hello.txt
+++ b/production/sites/cakelampvm.com/hello.txt
@@ -1,25 +1,2 @@
 Welcome to the CakePHP LAMP VM.
-
-Please refer to the built-in documentation available at: http://cakelampvm.com
-
-Some first steps to make this vm your own:
-
-####
-
-1) change your password for the developer account.
-(may eventually be automatically required)
-
-####
-
-2) change your git configuration for user and email.  this is how we've
-configured it so far:
-
-  # git config --global user.email "developer@cakelampvm.com"
-  # git config --global user.name "Developer J. Cakemo"
-
-if you're developing on a real project, you probably don't want the bogus
-email and even more bogus name above attached to your commits.
-Just run the two commands again but with proper values.
-
-####
-
+Documentation is available at: http://cakelampvm.com
diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh
index ea31020f..d966b69f 100644
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@ -24,6 +24,8 @@ echo "Regenerating feisty meow loading dock."
 
 reconfigure_feisty_meow
 test_or_die "feisty meow reconfiguration"
+chown -R "$(logname)":"$(logname)" /home/$(logname)/.[a-zA-Z0-9]*
+test_or_die "fix after reconfigured as sudo"
 
 ##############
 
@@ -38,7 +40,7 @@ test_or_die "group_perm www-data"
 ##############
 
 # set up access on some important folders for the developer user.
-chown -R developer:developer /home/developer
+chown -R developer:developer /home/developer /home/developer/.[a-zA-Z0-9]*
 test_or_die "chown developer home"
 harsh_perm /home/developer/.ssh
 test_or_die "harsh_perm setting on developer .ssh"
@@ -50,7 +52,7 @@ test_or_die "group perms on apache2 and bind"
 ##############
 
 # fix perms for fred user.
-chown -R fred:fred /home/fred /home/archives/stuffing 
+chown -R fred:fred /home/fred /home/archives/stuffing /home/fred/.[a-zA-Z0-9]*
 test_or_die "chown fred home"
 group_perm $HOME/apps
 test_or_die "group perms on fred's apps"
@@ -84,7 +86,7 @@ fi
 
 # install a better editor app.
 
-echo " The script is about to install the bluefish editor and some dependencies.
+echo "The script is about to install the bluefish editor and some dependencies.
 If the app is not already installed, then this process takes only about a
 minute on a slower home DSL internet connection..."
 
@@ -141,6 +143,9 @@ echo "
 
 "
 regenerate
+test_or_die "regenerating feisty meow scripts"
+chown -R "$(logname)":"$(logname)" /home/$(logname)/.[a-zA-Z0-9]*
+test_or_die "fix after regenerate as sudo"
 echo "