Commit 2d419fe1 authored by Michael Stucki's avatar Michael Stucki Committed by GitHub
Browse files

Merge pull request #7 from TYPO3-infrastructure/documentation-refinements

[TASK] Update documentation and fix some typos
parents af91f229 dd7ea2b9
On server On the server
============== ==============
* create default VM, attached to private network: * create a default VM, attached to private network:
```shell ```shell
virt-install-debian srvXXX # virt-install-debian srvXXX
``` ```
* press <strg>+5 to disconnect from the console once the boostrapping is finished, be patient before the next step * press <strg>+5 to disconnect from the console once the boostrapping is finished, be patient before the next step
* confirm succesfull creation with <y>-key * confirm succesfull creation with <y>-key
Chef Bootstrapping (On Your Workstation) Chef Bootstrapping (on your workstation)
======================================== ========================================
* make sure you are connected to the VPN * make sure you are connected to the VPN
...@@ -22,14 +22,14 @@ Chef Bootstrapping (On Your Workstation) ...@@ -22,14 +22,14 @@ Chef Bootstrapping (On Your Workstation)
Customisation of virtual machine Customisation of virtual machine
===================================== =====================================
Feel free to customise the machine via /etc/libvir/qemu/*.xml files and tools. Feel free to customize the machine in /etc/libvir/qemu/*.xml files and tools.
Update Config (On server) Update Config (on the server)
===================================== =====================================
Optional, should not be required during daily operations Optional (should not be required during daily operations)
* edit variables in `/root/machine.conf` * edit variables in `/root/machine.conf`
Read the source of the shell script for further details Read the source of the shell script for further details.
\ No newline at end of file
...@@ -2,20 +2,20 @@ ...@@ -2,20 +2,20 @@
MACHINE_CONF_FILE="/root/machine.conf" MACHINE_CONF_FILE="/root/machine.conf"
if [ ! -f "$MACHINE_CONF_FILE" ]; then if [ ! -f "$MACHINE_CONF_FILE" ]; then
echo "please checke existance of $MACHINE_CONF_FILE" echo "Please check existence of $MACHINE_CONF_FILE"
exit 99 exit 99
fi fi
source $MACHINE_CONF_FILE source $MACHINE_CONF_FILE
if [ -z "$1" ]; then if [ -z "$1" ]; then
echo "you must supply server name like srvXXX as argument" echo "You must supply a server name like srvXXX as argument"
exit 99 exit 99
else else
SERVER_NAME=$1 SERVER_NAME=$1
SERVER_IPV4_ADDRESS=$(echo "$SERVER_NAME" | sed -r -n 's/(srv)([0-9]{3})/\2/p') SERVER_IPV4_ADDRESS=$(echo "$SERVER_NAME" | sed -r -n 's/(srv)([0-9]{3})/\2/p')
if [[ ! "$SERVER_IPV4_ADDRESS" =~ ^[0-9]{3}$ ]]; then if [[ ! "$SERVER_IPV4_ADDRESS" =~ ^[0-9]{3}$ ]]; then
echo "Could not validate $SERVER_IPV4_ADDRESS" echo "Could not validate IPv4: $SERVER_IPV4_ADDRESS"
exit 99 exit 99
else else
NET_IPV4_ADDRESS="$SERVER_IPV4_BLOCK.$SERVER_IPV4_ADDRESS" NET_IPV4_ADDRESS="$SERVER_IPV4_BLOCK.$SERVER_IPV4_ADDRESS"
...@@ -25,15 +25,15 @@ fi ...@@ -25,15 +25,15 @@ fi
# we should now have the following variables # we should now have the following variables
echo "SERVER_NAME $SERVER_NAME" echo "SERVER_NAME: $SERVER_NAME"
#echo "NET_IPV4_MAC $NET_IPV4_MAC" #echo "NET_IPV4_MAC $NET_IPV4_MAC"
echo "NET_IPV4_ADDRESS $NET_IPV4_ADDRESS" echo "NET_IPV4_ADDRESS: $NET_IPV4_ADDRESS"
echo "NET_IPV4_GATEWAY $NET_IPV4_GATEWAY" echo "NET_IPV4_GATEWAY: $NET_IPV4_GATEWAY"
echo "NET_IPV4_BROADCAST $NET_IPV4_BROADCAST" echo "NET_IPV4_BROADCAST: $NET_IPV4_BROADCAST"
echo "NET_IPV4_NETMASK $NET_IPV4_NETMASK" echo "NET_IPV4_NETMASK: $NET_IPV4_NETMASK"
read -p "Do you cant to create a machine with this config? " -n 1 -r read -p "Do you want to create a machine with this config? " -n 1 -r
if [[ ! $REPLY =~ ^[Yy]$ ]] if [[ ! $REPLY =~ ^[Yy]$ ]]
then then
exit 1 exit 1
...@@ -59,7 +59,7 @@ PASSWORD=$(makepasswd --minchars=10 --maxchars=12) ...@@ -59,7 +59,7 @@ PASSWORD=$(makepasswd --minchars=10 --maxchars=12)
echo "Generated random password" echo "Generated random password"
echo "ADD TO PASSWORD STORE/KEEP IN SAFE PLACE" echo "ADD TO PASSWORD STORE/KEEP IN SAFE PLACE"
echo $PASSWORD echo $PASSWORD
read -p "Are you reay to continue? " -n 1 -r read -p "Are you ready to continue? " -n 1 -r
if [[ ! $REPLY =~ ^[Yy]$ ]] if [[ ! $REPLY =~ ^[Yy]$ ]]
then then
exit 1 exit 1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment