Merge release 0.4.2 into develop

12 files changed, 13 insertions, 13 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)