From: Chris Koeritz Date: Tue, 21 Nov 2017 06:05:13 +0000 (-0500) Subject: Merge branch 'release-2.140.104' X-Git-Tag: 2.140.104^0 X-Git-Url: https://feistymeow.org/gitweb/?p=feisty_meow.git;a=commitdiff_plain;h=a17551ede4d20895fae86bf6615674cbc803b45b;hp=b237ba491962f03bc342fdd4186494c35e29cdea Merge branch 'release-2.140.104' doc updates --- diff --git a/production/feisty_meow_config.ini b/production/feisty_meow_config.ini index 19a79a96..8d40e50c 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=103 +revision=104 build=420 # specifies the remainder of the version record info. diff --git a/production/sites/cakelampvm.com/docs/manual/cakelampvm_guide_v002.html b/production/sites/cakelampvm.com/docs/manual/cakelampvm_guide_v002.html index 8473cc27..2d540069 100644 --- a/production/sites/cakelampvm.com/docs/manual/cakelampvm_guide_v002.html +++ b/production/sites/cakelampvm.com/docs/manual/cakelampvm_guide_v002.html @@ -7,10 +7,11 @@

The cakelampvm VM:
Configuration and Usage

-

By Chris Koeritz
- feisty meow® concerns ltd

+
By Chris + Koeritz
+ feisty meow® concerns ltd.

Vintage: cakelampvm v002    - Updated: 2017-11-20 (rev F)

+ Updated: 2017-11-20 (rev. g)

The cakelampvm project provides a Virtualbox VM that acts as an "internet in a bottle", serving up your web sites securely and only to your local host.  The virtual machine provides DNS services (   -

  • Change your git configuration for the user and email address.  This - is how we've configured it so far:
    +
  • Change your git configuration for the user and email address.  + 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 @@ -462,9 +463,10 @@ href="http://mapsdemo.cakelampvm.com">http://mapsdemo.cakelampvm.com

    A git branching model that seems to work well: http://nvie.com/posts/a-successful-git-branching-model/

    Get the network address on the guest vm

    -

    Run this command: ifconfig

    -

    In the results, look for "inet addr".  There may be more than one, - if there are multiple network interfaces.

    +

    Run this command:

    + 
    # ifconfig
    +

    In the results, look for "inet addr".  + There may be more than one, if there are multiple network interfaces.

    The standard IP address is 10.28.42.20 for the cakelampvm.

    How to cleanly reboot or shut down the guest VM

    When you've got the DNS and everything integrated, these commands will @@ -541,13 +543,12 @@ href="http://mapsdemo.cakelampvm.com">http://mapsdemo.cakelampvm.com title="cakebundtu" href="https://askubuntu.com/questions/628938/how-to-install-cakephp-in-ubuntu-14-04">https://askubuntu.com/questions/628938/how-to-install-cakephp-in-ubuntu-14-04

  • Configured the two network adapters as needed (one for host-only network and one for nat network).  Here's some info about - Virtualbox networking with two adapters similar to our setup: - https://askubuntu.com/questions/293816/in-virtualbox-how-do-i-set-up-host-only-...
    + Virtualbox networking with two adapters similar to our setup: https://askubuntu.com/questions/293816/in-virtualbox-how-do-i-set-up-host-only-...
  • Installed and configured Samba service for the guest VM.  The main config file lives in "/etc/samba/smb.conf".  Some pointers - here: - https://help.ubuntu.com/community/How%20to%20Create...
    • + here: https://help.ubuntu.com/community/How%20to%20Create...