Chris Koeritz [Wed, 3 Jan 2018 16:57:53 +0000 (11:57 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Wed, 3 Jan 2018 16:56:10 +0000 (11:56 -0500)]
trying without --no-ff
the fast forward feature seems important to avoid unnecessary merge messages from checkin. we need to be careful at merge time with a branch to say: git merge --no-ff <thebranch>
because otherwise we would lose all the changes that occurred on the branch. but remembering every trivial merge, even those without contents, is not good, so --no-ff needs to be dumped for most pulls.
Chris Koeritz [Mon, 1 Jan 2018 15:19:36 +0000 (10:19 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 30 Dec 2017 20:31:25 +0000 (15:31 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 29 Dec 2017 16:27:25 +0000 (11:27 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 29 Dec 2017 16:18:10 +0000 (11:18 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 29 Dec 2017 16:17:43 +0000 (11:17 -0500)]
unfixed the bad fix of ignoring current
we do need to update even the same branch we start with, since its remote origin can have changes.
Chris Koeritz [Fri, 29 Dec 2017 16:15:09 +0000 (11:15 -0500)]
stopped redundant merges, added reconfigure note
Chris Koeritz [Fri, 29 Dec 2017 16:15:09 +0000 (11:15 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 24 Dec 2017 19:44:05 +0000 (14:44 -0500)]
attempting to auto-fix wine link issues
lower case and upper case names are sometimes sloppily used by the mod coders rather than the exact path, which causes problems on wine.
Chris Koeritz [Sun, 24 Dec 2017 19:40:55 +0000 (14:40 -0500)]
new script to minimize git checkout memory usage
Chris Koeritz [Fri, 22 Dec 2017 22:29:23 +0000 (17:29 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 22 Dec 2017 21:38:13 +0000 (21:38 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 21 Dec 2017 17:37:01 +0000 (12:37 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Thu, 21 Dec 2017 14:32:05 +0000 (09:32 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Fred T. Hamster [Wed, 20 Dec 2017 03:12:40 +0000 (22:12 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Wed, 20 Dec 2017 02:33:50 +0000 (21:33 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Wed, 20 Dec 2017 01:52:02 +0000 (20:52 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Wed, 20 Dec 2017 01:38:35 +0000 (20:38 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Fred T. Hamster [Wed, 20 Dec 2017 00:37:24 +0000 (19:37 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Wed, 20 Dec 2017 00:13:52 +0000 (19:13 -0500)]
doc push
now have a bit cleaner look, and got rid of brain dead comment character in front of commands.
Chris Koeritz [Tue, 19 Dec 2017 23:54:01 +0000 (18:54 -0500)]
added docs for ll and get_feisty
Chris Koeritz [Tue, 19 Dec 2017 23:48:48 +0000 (18:48 -0500)]
added get_feisty alias
just gets the code base up to date and reconfigures current user's feisty meow config
Chris Koeritz [Tue, 19 Dec 2017 23:48:42 +0000 (18:48 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 19 Dec 2017 23:31:04 +0000 (18:31 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 19 Dec 2017 23:28:09 +0000 (23:28 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 19 Dec 2017 23:27:58 +0000 (23:27 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 19 Dec 2017 21:19:00 +0000 (16:19 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 19 Dec 2017 21:11:14 +0000 (16:11 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 19 Dec 2017 21:11:12 +0000 (16:11 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 19 Dec 2017 21:09:37 +0000 (16:09 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 19 Dec 2017 20:36:29 +0000 (15:36 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Tue, 19 Dec 2017 19:01:40 +0000 (14:01 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 19 Dec 2017 12:54:29 +0000 (07:54 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 19 Dec 2017 12:50:06 +0000 (07:50 -0500)]
Merge branch 'release-2.140.106'
bringing in tasty changes from recent work on cakelampvm site/docs and site avenger scripts.
Chris Koeritz [Tue, 19 Dec 2017 12:48:57 +0000 (07:48 -0500)]
2.140.106 version for this release
Chris Koeritz [Tue, 19 Dec 2017 12:46:25 +0000 (07:46 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Tue, 19 Dec 2017 11:54:07 +0000 (06:54 -0500)]
slight issue with quoting
Chris Koeritz [Mon, 18 Dec 2017 22:10:59 +0000 (17:10 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 21:56:24 +0000 (16:56 -0500)]
improved diagnostic output
Chris Koeritz [Mon, 18 Dec 2017 21:36:56 +0000 (16:36 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 21:34:26 +0000 (16:34 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 21:33:56 +0000 (16:33 -0500)]
added option to change listing form of summing dir
and added a macro ll to capitalize on that. it is just like l or dir, but also shows dot files.
Chris Koeritz [Mon, 18 Dec 2017 21:14:18 +0000 (16:14 -0500)]
hiding output from mysql for now
Chris Koeritz [Mon, 18 Dec 2017 21:12:38 +0000 (16:12 -0500)]
disable echo during password entry
Chris Koeritz [Mon, 18 Dec 2017 21:10:27 +0000 (16:10 -0500)]
pushed mysql actions up to top
Chris Koeritz [Mon, 18 Dec 2017 20:57:45 +0000 (15:57 -0500)]
wasn't forcing copy as expected
Chris Koeritz [Mon, 18 Dec 2017 20:54:59 +0000 (15:54 -0500)]
skip user creation if already exists, avoid errors
Chris Koeritz [Mon, 18 Dec 2017 20:54:59 +0000 (15:54 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 20:35:17 +0000 (15:35 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 19:59:29 +0000 (14:59 -0500)]
stumbling towards correctness
Chris Koeritz [Mon, 18 Dec 2017 19:50:43 +0000 (14:50 -0500)]
fix for mysql password and samba mod
Chris Koeritz [Mon, 18 Dec 2017 19:41:10 +0000 (14:41 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 19:23:19 +0000 (14:23 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 19:06:36 +0000 (14:06 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 19:06:36 +0000 (14:06 -0500)]
new fortunes
Chris Koeritz [Mon, 18 Dec 2017 18:55:48 +0000 (13:55 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 17:45:26 +0000 (12:45 -0500)]
slightly more abstract
Chris Koeritz [Mon, 18 Dec 2017 17:45:26 +0000 (12:45 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Fred T. Hamster [Mon, 18 Dec 2017 16:27:55 +0000 (11:27 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 16:02:08 +0000 (11:02 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 16:00:46 +0000 (11:00 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 15:54:01 +0000 (10:54 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 15:53:57 +0000 (10:53 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 15:51:14 +0000 (15:51 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 15:50:07 +0000 (15:50 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 15:42:31 +0000 (10:42 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 15:37:53 +0000 (10:37 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 14:49:26 +0000 (09:49 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 13:57:49 +0000 (08:57 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 13:30:31 +0000 (08:30 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 13:30:15 +0000 (13:30 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 13:29:56 +0000 (08:29 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 13:04:07 +0000 (13:04 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 13:01:41 +0000 (08:01 -0500)]
added shadow site and more vamps
there is now a shadow site blah.cakelampvm.com for every site blah.X, implemented in both standup and teardown but untested.
revamp adds apache env vars file now.
Chris Koeritz [Mon, 18 Dec 2017 12:37:08 +0000 (07:37 -0500)]
fixed doc errors plus vm script mods
revised the command reference for a couple text bugs that kevin noticed.
new rolling file for setting apache2 environment variables; script to deploy still needed.
mod to powerup to force permissions on app dir.
good changes to revamp, now with some mysql powers.
Chris Koeritz [Mon, 18 Dec 2017 11:47:33 +0000 (06:47 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 11:47:05 +0000 (06:47 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 04:52:00 +0000 (23:52 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 04:50:20 +0000 (04:50 +0000)]
dropped size down to about 10 megs for pack
seems good enough...
Chris Koeritz [Mon, 18 Dec 2017 02:15:01 +0000 (02:15 +0000)]
cleaning out some hugely obsolete libs and such
dtree javascript library, way obsolete. also curl, zlib and openssl for
windows, probably fulla holes.
Chris Koeritz [Mon, 18 Dec 2017 02:05:35 +0000 (02:05 +0000)]
lost track of attempts to dump cruft
still working towards a clean archive. lots of weird patterns are needed to match the assortment of files produced by the doxygen run.
Chris Koeritz [Mon, 18 Dec 2017 02:05:35 +0000 (02:05 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 02:04:58 +0000 (21:04 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 18 Dec 2017 02:04:56 +0000 (21:04 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 17 Dec 2017 22:48:06 +0000 (17:48 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 17 Dec 2017 18:42:40 +0000 (13:42 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Sun, 17 Dec 2017 17:31:46 +0000 (17:31 +0000)]
attempt 5 -- actual progress
have started seeing a size reduction, so this approach is working. just
need to list all the different awful files that the code guide could
contain.
Chris Koeritz [Sun, 17 Dec 2017 17:27:37 +0000 (17:27 +0000)]
attempt 4 with realization
seems like tar's exclude feature doesn't support arbitrary paths, and
only supports single per file patterns, like *.ugh or *ophilus.morp,
rather than being for any old cool pattern. this was not apparent until
now; has it always been thus?
Chris Koeritz [Sun, 17 Dec 2017 17:17:59 +0000 (17:17 +0000)]
attempt 3 and getting pretty frustrated
the exclude docs are not really helping, or the feature is just really
not working. trying now to use just the most simplistic pattern
possible, which is only the dir name. stars in the pattern just seem to
get completely ignored somehow, or slashes make it fail, or some kind of
insanity that seemingly didn't used to happen.
Chris Koeritz [Sun, 17 Dec 2017 17:16:29 +0000 (17:16 +0000)]
attempt 2 at fixing stupid exclude fail
Chris Koeritz [Sun, 17 Dec 2017 17:13:28 +0000 (17:13 +0000)]
attempting to fix fat releases
the code_guide is being included, despite there being a pattern that
looks right to me. tried taking the patterns out of quotes, since the
--exclude= in front should hose any globbing attempts anyhow.
Chris Koeritz [Sun, 17 Dec 2017 17:10:44 +0000 (17:10 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 17 Dec 2017 17:05:41 +0000 (12:05 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 17 Dec 2017 17:04:04 +0000 (12:04 -0500)]
fix for out of date hostname
Chris Koeritz [Sun, 17 Dec 2017 16:00:30 +0000 (16:00 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 17 Dec 2017 14:54:42 +0000 (09:54 -0500)]
nice generalization for raw synch
now takes a hostname.
Chris Koeritz [Sun, 17 Dec 2017 13:49:36 +0000 (08:49 -0500)]
samba fix for user homes should work now.
Chris Koeritz [Sun, 17 Dec 2017 13:26:00 +0000 (08:26 -0500)]
slightly tastier
fixed the recent bind section, since it was not closed properly.
added restart_samba function.
added code for fixing samba config for user dirs to have write access; not done yet.
Chris Koeritz [Sun, 17 Dec 2017 13:18:27 +0000 (08:18 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
projects / feisty_meow.git / log