Merge release 0.4.2 into develop

21 files changed, 53 insertions, 51 deletions

diff --git a/core/conf/exim/aliases b/core/conf/exim/aliases
index 2efb04c..2849996 100644
--- a/core/conf/exim/aliases
+++ b/core/conf/exim/aliases
@@ -4,7 +4,7 @@
 # The following alias is required by the mail RFCs 2821 and 2822.
 # Set it to the address of a HUMAN who deals with this system's mail problems.
 
-postmaster: c9admin
+postmaster: machine-admin
 
 # It is also common to set the following alias so that if anybody replies to a
 # bounce message from this host, the reply goes to the postmaster.
diff --git a/core/conf/hosts b/core/conf/hosts
index 4069af5..81c73a6 100644
--- a/core/conf/hosts
+++ b/core/conf/hosts
@@ -3,11 +3,11 @@
 #
 # IPv4 LocalHosts
 127.0.0.1	localhost.localdomain localhost
-127.0.0.1       c9.core c9
+127.0.0.1       machine.example machine
 
 # IPv4 Internet
 #<ip-address>	<hostname.domain.org>	<aliases>
-10.0.0.1	c9.core.cx
+10.0.0.1	machine.example.org
 
 # IPv6
 #::1		ip6-localhost	ip6-loopback
diff --git a/core/conf/pkgmk.conf b/core/conf/pkgmk.conf
index e72a433..4085a38 100644
--- a/core/conf/pkgmk.conf
+++ b/core/conf/pkgmk.conf
@@ -22,7 +22,7 @@ case ${PKGMK_ARCH} in
 		;;
 esac
 
-#PKGMK_SOURCE_MIRRORS=(http://hive.gnu.systems/ports/distfiles/)
+#PKGMK_SOURCE_MIRRORS=(http://machine.example.org/ports/distfiles/)
 # PKGMK_SOURCE_DIR="$PWD"
 PKGMK_SOURCE_DIR="/usr/ports/distfiles"
 # PKGMK_PACKAGE_DIR="$PWD"
diff --git a/core/conf/pkgmk.conf.harden b/core/conf/pkgmk.conf.harden
index f72dc53..f2ab5a6 100644
--- a/core/conf/pkgmk.conf.harden
+++ b/core/conf/pkgmk.conf.harden
@@ -78,7 +78,7 @@ esac
 
 #PKGMK_SOURCE_MIRRORS=(https://crux.nu/distfiles/)
 #PKGMK_SOURCE_MIRRORS=(https://crux.ster.zone/distfiles/)
-PKGMK_SOURCE_MIRRORS=(https://hive.gnu.systems/ports/distfiles/)
+PKGMK_SOURCE_MIRRORS=(https://machine.example.org/ports/distfiles/)
 PKGMK_SOURCE_DIR="/srv/ports/distfiles"
 PKGMK_PACKAGE_DIR="/srv/ports/packages"
 PKGMK_WORK_DIR="/srv/ports/work/$name"
diff --git a/core/conf/ports/contrib.git b/core/conf/ports/contrib.git
index 2516a71..461f70a 100644
--- a/core/conf/ports/contrib.git
+++ b/core/conf/ports/contrib.git
@@ -2,6 +2,6 @@
 #
 NAME=contrib
 URL=git://c2.ank/contrib.git
-BRANCH=develop-c34
+BRANCH=master
 destination=/usr/ports/contrib
 PORTS_DIR="/usr/ports"
diff --git a/core/conf/ports/core.git b/core/conf/ports/core.git
index 50ac623..e907dcb 100644
--- a/core/conf/ports/core.git
+++ b/core/conf/ports/core.git
@@ -2,6 +2,6 @@
 #
 NAME=core
 URL=git://c2.ank/core.git
-BRANCH=develop-c34
+BRANCH=master
 destination=/usr/ports/core
 PORTS_DIR="/usr/ports"
diff --git a/core/conf/ports/mate.git b/core/conf/ports/mate.git
index 0c4e057..7335ba4 100644
--- a/core/conf/ports/mate.git
+++ b/core/conf/ports/mate.git
@@ -2,6 +2,6 @@
 #
 NAME=mate
 URL=git://c2.ank/mate.git
-BRANCH=develop-c34
+BRANCH=master
 destination=/usr/ports/mate
 PORTS_DIR="/usr/ports"
diff --git a/core/conf/ports/opt.git b/core/conf/ports/opt.git
index 77ba4cd..4cad2d2 100644
--- a/core/conf/ports/opt.git
+++ b/core/conf/ports/opt.git
@@ -2,6 +2,6 @@
 #
 NAME=opt
 URL=git://c2.ank/opt.git
-BRANCH=develop-c34
+BRANCH=master
 destination=/usr/ports/opt
 PORTS_DIR="/usr/ports"
diff --git a/core/conf/ports/ports.git b/core/conf/ports/ports.git
index 23d9586..f099049 100644
--- a/core/conf/ports/ports.git
+++ b/core/conf/ports/ports.git
@@ -2,6 +2,6 @@
 #
 NAME=ports
 URL=git://c2.ank/ports.git
-BRANCH=develop
+BRANCH=master
 destination=/usr/ports/ports
 PORTS_DIR="/usr/ports"
diff --git a/core/conf/ports/xorg.git b/core/conf/ports/xorg.git
index 70ce45b..5e80694 100644
--- a/core/conf/ports/xorg.git
+++ b/core/conf/ports/xorg.git
@@ -2,6 +2,6 @@
 #
 NAME=xorg
 URL=git://c2.ank/xorg.git
-BRANCH=develop-c34
+BRANCH=master
 destination=/srv/ports/xorg
 PORTS_DIR="/usr/ports"
diff --git a/core/conf/prt-get.conf b/core/conf/prt-get.conf
index 9683cfe..1f7a39e 100644
--- a/core/conf/prt-get.conf
+++ b/core/conf/prt-get.conf
@@ -6,7 +6,7 @@
 prtdir /usr/ports/core
 prtdir /usr/ports/opt
 prtdir /usr/ports/contrib
-prtdir /usr/ports/c9-ports
+prtdir /usr/ports/machine-ports
 prtdir /usr/ports/xorg
 
 # 6c37 team provides a collection with freetype-iu, fontconfig-iu
diff --git a/core/conf/rc.conf b/core/conf/rc.conf
index ef31a33..6780fc3 100644
--- a/core/conf/rc.conf
+++ b/core/conf/rc.conf
@@ -5,7 +5,7 @@
 FONT=default
 KEYMAP=dvorak
 TIMEZONE="Europe/Lisbon"
-HOSTNAME=c9
+HOSTNAME=machine
 SYSLOG=sysklogd
 SERVICES=(lo iptables net crond)
 
diff --git a/core/configure.html b/core/configure.html
index 7d34bf7..c814091 100644
--- a/core/configure.html
+++ b/core/configure.html
@@ -45,24 +45,24 @@
 
         <h2 id="hostname">1.2.1. Set hostname and hosts</h2>
 
-        <p>Give it a name, this example we will call it c9;</p>
+        <p>Give it a name, this example we will call it machine;</p>
 
         <pre>
-        # hostname c9
+        # hostname machine
         </pre>
 
         <p>Edit /etc/hosts to contain your hostname and FQDN,
-        this example uses c9.core and hive.gnu.systems sub-domain from
+        this example uses machine.example and machine.example.org sub-domain from
         <a href="http://freedns.afraid.org">afraid.org</a> pointing
         to 10.0.0.1 ip;</p>
 
         <pre>
         # IPv4
         127.0.0.1	localhost.localdomain localhost
-        127.0.0.1       c9.core c9
+        127.0.0.1       machine.example machine
 
         #&lt;ip-address&gt;	&lt;hostname.domain.org&gt;	&lt;aliases&gt;
-        10.0.0.1                hive.gnu.systems
+        10.0.0.1                machine.example.org
 
         # IPv6
         #::1		ip6-localhost	ip6-loopback
@@ -79,9 +79,9 @@
 
         <pre>
         $ hostname
-        c9
+        machine
         $ hostname -f
-        c9.core
+        machine.example
         </pre>
 
         <h2 id="time">1.2.2. Set timezone</h2>
@@ -185,14 +185,15 @@
 	</dl>
 
         <pre>
-        # useradd -m -k /etc/skel -s /bin/bash c9admin
-        # usermod -G adm,wheel,audio,video c9admin
-        # passwd c9admin
+        # group -g username username
+        # useradd -u username -g username -m -k /etc/skel -s /bin/bash username
+        # usermod -G adm,wheel,audio,video username
+        # passwd username
         </pre>
 
         <pre>
         # chmod 0700 /root
-        # chmod 0700 /home/c9admin
+        # chmod 0700 /home/username
         </pre>
 
         <h3>1.2.4.3 Add Administrator to Wheel group</h3>
@@ -262,7 +263,7 @@
         FONT=default
         KEYMAP=dvorak
         TIMEZONE="Europe/Lisbon"
-        HOSTNAME=c9
+        HOSTNAME=machine
         SYSLOG=sysklogd
         SERVICES=(lo iptables wlan crond)
 
diff --git a/core/exim.html b/core/exim.html
index 23708d2..7e1fd28 100644
--- a/core/exim.html
+++ b/core/exim.html
@@ -22,9 +22,9 @@
         <p>Exim creates a key for you if you just copy exim.conf and start daemon;</p>
 
         <pre>
-        # cp /home/silvino/data/git/c9/c9-doc/core/conf/exim/exim.conf /etc/exim/exim.conf
+        # cp /home/username/data/git/doc/core/conf/exim/exim.conf /etc/exim/exim.conf
         # sh /etc/rc.d/exim start
-        SSL certificate /etc/ssl/certs/exim.crt with key /etc/ssl/keys/exim.key for host c9.core created
+        SSL certificate /etc/ssl/certs/exim.crt with key /etc/ssl/keys/exim.key for host machine.example created
         #
         </pre>
 
@@ -53,8 +53,8 @@
 	Locality Name (eg, city) []:
 	Organization Name (eg, company) [Internet Widgits Pty Ltd]:
 	Organizational Unit Name (eg, section) []:
-	Common Name (e.g. server FQDN or YOUR name) []:core.privat-server.net
-	Email Address []:postmaster@core.privat-server.net
+	Common Name (e.g. server FQDN or YOUR name) []:machine.example.org
+	Email Address []:postmaster@machine.example.org
 	#
         </pre>
 
@@ -76,7 +76,7 @@
         # The following alias is required by the mail RFCs 2821 and 2822.
         # Set it to the address of a HUMAN who deals with this system's mail problems.
 
-        postmaster: c9admin
+        postmaster: machine-admin
 
         # It is also common to set the following alias so that if anybody replies to a
         # bounce message from this host, the reply goes to the postmaster.
diff --git a/core/install.html b/core/install.html
index fb1a546..69a82cf 100644
--- a/core/install.html
+++ b/core/install.html
@@ -309,16 +309,16 @@
 
         <h2 id="step6">1.1.6. Install extra ports</h2>
 
-        <p>Create c9 ports;</p>
+        <p>Create port collection;</p>
 
         <pre>
-        $ sudo mkdir $CHROOT/usr/ports/c9-ports
+        $ sudo mkdir $CHROOT/usr/ports/machine-ports
         </pre>
 
-        <p>Copy ports from  c9-doc/core/ports;</p>
+        <p>Copy ports from  doc/core/ports;</p>
 
         <pre>
-        $ sudo cp -r ports/* $CHROOT/usr/ports/c9-ports/
+        $ sudo cp -r ports/* $CHROOT/usr/ports/machine-ports/
         </pre>
 
         <h2 id="step7">1.1.7. DNS Resolver</h2>
@@ -335,7 +335,7 @@
 
         <h2 id="step9">1.1.9. Basic Skeleton</h2>
 
-        <p>Copy skeletons from  c9-doc/core/conf;</p>
+        <p>Copy skeletons from  doc/core/conf;</p>
 
         <pre>
         $ sudo cp -R  conf/skel $CHROOT/etc/
diff --git a/core/network.html b/core/network.html
index 2b94e50..5913845 100644
--- a/core/network.html
+++ b/core/network.html
@@ -38,7 +38,7 @@
         FONT=default
         KEYMAP=dvorak
         TIMEZONE="Europe/Lisbon"
-        HOSTNAME=c9
+        HOSTNAME=machine
         SYSLOG=sysklogd
         SERVICES=(lo iptables wlan crond)
 
diff --git a/core/package.html b/core/package.html
index bedb132..e0f8eae 100644
--- a/core/package.html
+++ b/core/package.html
@@ -116,13 +116,13 @@
         <p>Clone this documentation;</p>
 
         <pre>
-        $ git clone https://github.com/s1lvino/c9-doc.git
+        $ git clone git://hive.gnu.systems/ports.git
         </pre>
 
         <p>Install collections later documented;</p>
 
         <pre>
-        $ sudo cp c9-doc/core/conf/ports/* /etc/ports/
+        $ sudo cp doc/core/conf/ports/* /etc/ports/
         </pre>
 
         <p>Edit /etc/prt-get.conf to activate new collections;</p>
@@ -132,7 +132,7 @@
         prtdir /usr/ports/contrib
 
         # ports described on this documentation
-        prtdir /usr/ports/c9-ports
+        prtdir /usr/ports/machine-ports
 
         # 6c37 team provides a collection with freetype-iu, fontconfig-iu
         # and cairo-iu ports.
@@ -143,7 +143,7 @@
         <p>Get new ports;</p>
 
         <pre>
-        $ sudo ports -u c9-ports
+        $ sudo ports -u machine-ports
         $ sudo ports -u 6c37-dropin
         $ sudo ports -u 6c37
         </pre>
diff --git a/core/ports.html b/core/ports.html
index 32e5095..34583d1 100644
--- a/core/ports.html
+++ b/core/ports.html
@@ -29,14 +29,15 @@
 	Add a user that will be used by ports tools, this example pkgmk;</p>
 
         <pre>
-        # useradd -U -M -d /usr/ports -s /bin/false pkgmk
+        # group -r -g pkgmk pkgmk
+        # useradd -r -u pkgmk -g pkgmk -m -d /usr/ports -s /bin/false pkgmk
         </pre>
 
         <p>You can add your self to group pkgmk. Check if members of this
         group are under <a href="linux.html#sysctl">tpe</a> protection.</p>
 
         <pre>
-        # usermod -a -G pkgmk c9admin
+        # usermod -a -G pkgmk username
         </pre>
 
         <pre>
@@ -96,7 +97,7 @@
                         ;;
         esac
 
-        #PKGMK_SOURCE_MIRRORS=(http://hive.gnu.systems/ports/distfiles/)
+        #PKGMK_SOURCE_MIRRORS=(http://machine.example.org/ports/distfiles/)
         # PKGMK_SOURCE_DIR="$PWD"
         PKGMK_SOURCE_DIR="/usr/ports/distfiles"
         # PKGMK_PACKAGE_DIR="$PWD"
@@ -137,7 +138,7 @@
         prtdir /usr/ports/core
         prtdir /usr/ports/opt
         prtdir /usr/ports/contrib
-        prtdir /usr/ports/c9-ports
+        prtdir /usr/ports/ports
         prtdir /usr/ports/xorg
 
         # 6c37 team provides a collection with freetype-iu, fontconfig-iu
diff --git a/core/reboot.html b/core/reboot.html
index 505a889..f7a34d6 100644
--- a/core/reboot.html
+++ b/core/reboot.html
@@ -50,7 +50,7 @@
         <p>If you don't have the port binary package build it;</p>
 
         <pre>
-        # cd /usr/ports/c9-ports/linux-gnu
+        # cd /usr/ports/machine-ports/linux-gnu
         # pkgmk -d
         </pre>
 
@@ -65,7 +65,7 @@
         <p>Install dracut;</p>
 
         <pre>
-        # cd /usr/ports/c9-ports/dracut
+        # cd /usr/ports/machine-ports/dracut
         # pkgmk -d
         # pkgadd /usr/ports/packages/dracut#044-2.pkg.tar.gz
         </pre>
diff --git a/core/scripts/setup-core.sh b/core/scripts/setup-core.sh
index 8a85d4a..45bce87 100644
--- a/core/scripts/setup-core.sh
+++ b/core/scripts/setup-core.sh
@@ -1,18 +1,18 @@
 #!/bin/bash
 
 # Absolute path to this script,
-# e.g. /home/user/c9-doc/core/scripts/foo.sh
+# e.g. /home/user/doc/core/scripts/foo.sh
 SCRIPT=$(readlink -f "$0")
 # Absolute path this script is in,
-# e.g. /home/user/c9-doc/core/scripts
+# e.g. /home/user/doc/core/scripts
 SCRIPTPATH=$(dirname "$SCRIPT")
 # Absolute path to doc section,
-# e.g /home/user/c9-doc/core
+# e.g /home/user/doc/core
 DIR_DATA=$(dirname "$SCRIPTPATH");
 
 CHROOT="/mnt"
 DATA_CNF="${DIR_DATA}/conf"
-ADMIN_USER="c9admin"
+ADMIN_USER="machine-admin"
 
 ConfirmOrExit()
 {
diff --git a/core/sysctl.html b/core/sysctl.html
index 525a6cf..d06afde 100644
--- a/core/sysctl.html
+++ b/core/sysctl.html
@@ -16,7 +16,7 @@
         <a href="http://www.cyberciti.biz/faq/linux-kernel-etcsysctl-conf-security-hardening/">Cyberciti Security Hardening</a>,
         <a href="https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options">Grsecurity and PaX Configuration</a>.</p>
 
-        <p>Since kernels on c9-ports have <a href="pax.grsecurity.net">PaX</a>
+        <p>Since kernels on machine-ports have <a href="pax.grsecurity.net">PaX</a>
         and <a href="http://grsecurity.net/announce.php">grsecurity</a>,
         <a href="conf/sysctl.conf">/etc/sysctl.conf</a> can have follow
         values;</p>