diff options
| author | Silvino Silva <silvino@bk.ru> | 2019-02-14 06:08:44 +0000 |
|---|---|---|
| committer | Silvino Silva <silvino@bk.ru> | 2019-02-14 06:08:44 +0000 |
| commit | fed632cea589a4fc730dc852538cb40ca6f559fa (patch) | |
| tree | 618a392022a78dd0cc7d4f7094d2051daa90e717 | |
| parent | bdfc05251acbb99c6bbcd4ff794a01dde2f8dc3b (diff) | |
| parent | 4fafa3dbe6bddda8655ad1a8521f99de9f5f9e24 (diff) | |
| download | doc-fed632cea589a4fc730dc852538cb40ca6f559fa.tar.gz | |
release 0.4.2
47 files changed, 145 insertions, 158 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 #<ip-address> <hostname.domain.org> <aliases> - 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> diff --git a/dev/git/index.html b/dev/git/index.html index 4e61822..e23e2a0 100644 --- a/dev/git/index.html +++ b/dev/git/index.html @@ -295,39 +295,39 @@ $ git ls-files --deleted -z | xargs -0 git rm </pre> - - <p>Mark all deleted to commit;</p> + <p>Query last commit that affected current file path</p> <pre> - $ git ls-files --deleted -z | xargs -0 git rm + $ git rev-list -n 1 HEAD -- . + $ git show f000 path/to/file + $ git diff --name-status f000 path/to/file </pre> - <h3 id="logdiff">2.2. Logs, diff commits</h3> - - <p>Create patch files to target branch/tag/ref;</p> + <p>Undo a file to specific commit</p> <pre> - $ git format-patch --no-prefix software-v0.0.1 + $ git checkout f000^ -- path/to/file </pre> - <p>Same using diff tool;</p> + <p>Join multiple commits into single one;</p> <pre> - $ diff orig file > file.patch + $ git log --oneline + $ git rebase -i oldest_commit_to_rewrite </pre> - <p>Query last commit that affected current file path</p> + <h3 id="logdiff">2.2. Logs, diff commits</h3> + + <p>Create patch files to target branch/tag/ref;</p> <pre> - $ git rev-list -n 1 HEAD -- . - $ git show f000 path/to/file - $ git diff --name-status f000 path/to/file + $ git format-patch --no-prefix software-v0.0.1 </pre> - <p>Undo a file to specific commit</p> + <p>Same using diff command;</p> <pre> - $ git checkout f000^ -- path/to/file + $ diff orig file > file.patch </pre> <h3 id="remote">2.3. Working with remotes</h3> @@ -335,7 +335,7 @@ <p>Adding a new remote;</p> <pre> - $ git remote add newremotename https://github.com/user/repo.git + $ git remote add newremotename https://machine.example.org/repo.git </pre> <p>Update all branches with remote;</p> @@ -365,7 +365,6 @@ $ git config --global fetch.prune true </pre> - <p>This will prune on fetch or you can keep it manually;</p> <pre> @@ -375,7 +374,7 @@ <a href="../index.html">Development Index</a> <p>This is part of the Hive System Documentation. Copyright (C) 2018 - c9 Team. + Hive Team. See the file <a href="../../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> </body> diff --git a/dev/shell/dash.html b/dev/shell/dash.html index eb75abd..4cfd7bf 100644 --- a/dev/shell/dash.html +++ b/dev/shell/dash.html @@ -17,7 +17,7 @@ <a href="../index.html">Development Index</a> <p>This is part of the Hive System Documentation. Copyright (C) 2018 - c9 Team. + Hive Team. See the file <a href="../../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> </body> diff --git a/host.html b/host.html index 35d0d7c..4fe155f 100644 --- a/host.html +++ b/host.html @@ -24,7 +24,7 @@ <dd><a href="core/configure.html#fstab">Fstab</a></dd> <dt>Hostname</dt> - <dd>c9</dd> + <dd>machine</dd> <dd><a href="core/configure.html#hostname">Hostname</a></dd> <dd><a href="core/exim.html#cert">Exim certificates</a></dd> </dl> @@ -51,7 +51,7 @@ <dt>FQDN</dt> - <dd>core.privat-server.net</dd> + <dd>machine.example.org</dd> <dd><a href="tools/gpg.html#genkey">GPG certificates</a></dd> <dd><a href="tools/network.html#dnsmasq">Dnsmasq</a></dd> <dd><a href="tools/nginx.html">Nginx</a></dd> @@ -62,13 +62,6 @@ </dd> <dd><a href="tools/hostapd.html">Access Point</a></dd> - </dl> - - <h2>DevOps</h2> - <dl> - <dt>Dns</dt> - <dd><a href="tools/network.html#dnsmasq">Dns Server</a></dd> - <dt>SSH</dt> <dd><a href="tools/openssh.html">SSH Server</a></dd> <dd><a href="tools/openssh.html#sshid">Local Identities</a></dd> @@ -84,15 +77,9 @@ </dl> - <h2>Services</h2> - <dl> - <dt>Main Web Portal</dt> - <dd><a href="dev/laravel-app.html">Web Application</a></dd> - </dl> - <a href="index.html">Documentation Index</a> <p>This is part of the c9 Manual. - Copyright (C) 2016 + Copyright (C) 2019 c9 team. See the file <a href="fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/index.html b/index.html index 41d7690..9713326 100644 --- a/index.html +++ b/index.html @@ -38,7 +38,7 @@ <p>Version;</p> <pre> - rev 0.4.1 + rev 0.4.2 </pre> <a href="links.html">Links</a> contains relevant diff --git a/tools/conf/etc/dnsmasq.conf b/tools/conf/etc/dnsmasq.conf index 0bf96af..e8bec3e 100644 --- a/tools/conf/etc/dnsmasq.conf +++ b/tools/conf/etc/dnsmasq.conf @@ -84,7 +84,7 @@ local=/ank/ # Add domains which you want to force to an IP address here. # The example below send any host in double-click.net to a local # web-server. -address=/hive.gnu.systems/10.0.0.4 +address=/machine.example.org/10.0.0.4 # --address (and --server) work with IPv6 addresses too. #address=/www.thekelleys.org.uk/fe80::20d:60ff:fe36:f83 diff --git a/tools/conf/etc/gitweb.conf b/tools/conf/etc/gitweb.conf index 26034fb..2f95792 100644 --- a/tools/conf/etc/gitweb.conf +++ b/tools/conf/etc/gitweb.conf @@ -18,5 +18,5 @@ $feature{'highlight'}{'default'} = [1]; $feature{'pathinfo'}{'default'} = [1]; our @extra_breadcrumbs = ( - [ 'HomePage' => 'https://core.privat-network.net/' ], + [ 'HomePage' => 'https://machine.example.org/' ], ); diff --git a/tools/conf/etc/hosts.dnsmasq b/tools/conf/etc/hosts.dnsmasq index 839863a..4d361be 100644 --- a/tools/conf/etc/hosts.dnsmasq +++ b/tools/conf/etc/hosts.dnsmasq @@ -15,7 +15,6 @@ #255.255.255.255 broadcasthost #::1 localhost #fe80::1%lo0 localhost -103.5.149.90 rt.com # Custom host records are listed here. diff --git a/tools/conf/etc/nginx/sites-enabled/default.conf b/tools/conf/etc/nginx/sites-enabled/default.conf index f7c3484..c35b0cd 100644 --- a/tools/conf/etc/nginx/sites-enabled/default.conf +++ b/tools/conf/etc/nginx/sites-enabled/default.conf @@ -4,12 +4,12 @@ server { listen 443 ssl; # listen 80; - server_name c9.core; + server_name machine.example; # listen [::]:443 ssl http2; - ssl_certificate /etc/letsencrypt/live/c9.core/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/c9.core/privkey.pem; - ssl_trusted_certificate /etc/letsencrypt/live/c9.core/chain.pem; + ssl_certificate /etc/letsencrypt/live/machine.example/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/machine.example/privkey.pem; + ssl_trusted_certificate /etc/letsencrypt/live/machine.example/chain.pem; ssl_session_timeout 1d; ssl_session_cache shared:SSL:50m; ssl_session_tickets off; @@ -35,7 +35,7 @@ server { } location /doc { - alias /srv/www/c9-doc; + alias /srv/www/doc; index index.html; } @@ -59,12 +59,12 @@ server { location /task { index index.php; - alias /srv/www/c9-flyspray; + alias /srv/www/flyspray; try_files $uri $uri/ index.php$is_args$args; } location ~ ^/task(.+\.php)$ { ### This location block was the solution - alias /srv/www/c9-flyspray; + alias /srv/www/flyspray; fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_index index.php; try_files $uri /index.php =404; @@ -75,7 +75,7 @@ server { } location / { - alias /srv/www/c9-pmwiki/; + alias /srv/www/pmwiki/; index pmwiki.php; try_files $uri $uri/ /pmwiki.php$is_args$args; } @@ -83,14 +83,14 @@ server { # ACME challenge location ^~ /.well-known { allow all; - alias /srv/www/c9-pmwiki/pub/cert/.well-known/; + alias /srv/www/pmwiki/pub/cert/.well-known/; default_type "text/plain"; try_files $uri =404; } location ~ \.php$ { - alias /srv/www/c9-pmwiki; + alias /srv/www/pmwiki; index pmwiki.php; fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_index pmwiki.php; diff --git a/tools/conf/etc/nginx/sites-enabled/git.localhost.conf b/tools/conf/etc/nginx/sites-enabled/git.localhost.conf index d114ab8..910df66 100644 --- a/tools/conf/etc/nginx/sites-enabled/git.localhost.conf +++ b/tools/conf/etc/nginx/sites-enabled/git.localhost.conf @@ -1,7 +1,7 @@ server { listen 443 ssl; - server_name git.localhost git.c9.core git.core.privat-network.net; + server_name git.localhost git.machine.example git.machine.example.org; root /srv/www/gitweb; diff --git a/tools/conf/etc/nginx/sites/default.conf b/tools/conf/etc/nginx/sites/default.conf index 1c71c44..dcb076f 100644 --- a/tools/conf/etc/nginx/sites/default.conf +++ b/tools/conf/etc/nginx/sites/default.conf @@ -3,7 +3,7 @@ server { listen 443 ssl; # listen [::]:443 ssl; - server_name c9.core; + server_name machine.example; root /srv/www/default; diff --git a/tools/conf/etc/nginx/sites/drupal.conf b/tools/conf/etc/nginx/sites/drupal.conf index 0407a6a..f79ed14 100644 --- a/tools/conf/etc/nginx/sites/drupal.conf +++ b/tools/conf/etc/nginx/sites/drupal.conf @@ -3,7 +3,7 @@ server { listen 192.168.1.254:443 ssl; listen 10.0.0.254:443 ssl; - server_name c9.core + server_name machine.example root /srv/www/default/drupal; ## <-- Your only path reference. @@ -17,7 +17,7 @@ server { } location /doc { - alias /srv/www/c9-doc; + alias /srv/www/doc; autoindex on; } diff --git a/tools/conf/etc/nginx/sites/flyspray.conf b/tools/conf/etc/nginx/sites/flyspray.conf index 80b5530..ba174f1 100644 --- a/tools/conf/etc/nginx/sites/flyspray.conf +++ b/tools/conf/etc/nginx/sites/flyspray.conf @@ -3,7 +3,7 @@ server { listen 443 ssl; # listen [::]:443 ssl; - server_name c9.core; + server_name machine.example; root /srv/www/default/flyspray; index index.php; diff --git a/tools/conf/etc/nginx/sites/laravel.conf b/tools/conf/etc/nginx/sites/laravel.conf index e563a3e..addfd18 100644 --- a/tools/conf/etc/nginx/sites/laravel.conf +++ b/tools/conf/etc/nginx/sites/laravel.conf @@ -3,10 +3,10 @@ server { # listen [::]:443 ssl; root /srv/www/default/laravel/public; - server_name c9.core + server_name machine.example - location /c9-doc { - alias /srv/www/c9-doc; + location /doc { + alias /srv/www/doc; index index.html; autoindex on; } diff --git a/tools/conf/etc/rc.conf b/tools/conf/etc/rc.conf index e7c10c7..2dbf272 100644 --- a/tools/conf/etc/rc.conf +++ b/tools/conf/etc/rc.conf @@ -5,7 +5,7 @@ FONT=default KEYMAP=dvorak TIMEZONE="Europe/Lisbon" -HOSTNAME=c9 +HOSTNAME=machine SYSLOG=sysklogd SERVICES=(lo iptables wlan blan crond) diff --git a/tools/conf/srv/gitolite/gitolite.conf b/tools/conf/srv/gitolite/gitolite.conf index e7573dd..7975549 100644 --- a/tools/conf/srv/gitolite/gitolite.conf +++ b/tools/conf/srv/gitolite/gitolite.conf @@ -32,9 +32,9 @@ repo @mirror repo gitolite-admin RW+ = gitolite -repo c9-doc c9-ports c9-pmwiki c9-assistant +repo doc machine-ports pmwiki assistant config gitweb.owner = "Hive Team" - config gitweb.category = "c9" + config gitweb.category = "machine" repo linux-pck config gitweb.owner = "Hive Team" @@ -44,20 +44,20 @@ repo opt core contrib config gitweb.owner = "crux" config gitweb.category = "crux" -repo c9-doc - config gitweb.description = "c9 documentation" +repo doc + config gitweb.description = "documentation" option hook.post-receive = deploy-web-doc -repo c9-ports - config gitweb.description = "c9 ports" +repo machine-ports + config gitweb.description = "ports" -repo c9-pmwiki - config gitweb.description = "c9 wiki" +repo pmwiki + config gitweb.description = "wiki" option hook.post-receive = deploy-web-doc -repo c9-assistant +repo assistant config gitweb.owner = "Hive Team" - config gitweb.description = "c9 open assistant" + config gitweb.description = "open assistant" repo core config gitweb.description = "crux core collection" @@ -75,6 +75,6 @@ repo linux-pck @secret = gitolite-admin -@project = c9-doc c9-ports c9-pmwiki c9-assistant +@project = doc machine-ports pmwiki assistant @project = core opt contrib @mirror = linux-pck diff --git a/tools/dnsmasq.html b/tools/dnsmasq.html index 32480d6..a6a0046 100644 --- a/tools/dnsmasq.html +++ b/tools/dnsmasq.html @@ -27,7 +27,7 @@ <p>Dnscrypt by default resolves to dnscrypt.eu-nl, check file /usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv for a list of - compatible servers. Dnscrypt-proxy port from c9-ports contains + compatible servers. Dnscrypt-proxy port from machine-ports contains <a href="conf/etc/rc.d/dnscrypt-proxy">dnscrypt-proxy</a> init script configured to use dnscrypt.eu-dk resolver and run as nobody user. Basic usage example;</p> diff --git a/tools/gitolite.html b/tools/gitolite.html index a7a48a5..0e92158 100644 --- a/tools/gitolite.html +++ b/tools/gitolite.html @@ -50,8 +50,8 @@ machine you can use scp to copy the public key;</p> <pre> - $ scp /home/bob/.ssh/gitolite.pub admin@core.privat-network.net:/home/admin/ - bob@core.privat-network.net's password: + $ scp /home/bob/.ssh/gitolite.pub admin@machine.example.org:/home/admin/ + bob@machine.example.org's password: gitolite.pub 100% 390 0.4KB/s 00:00 </pre> @@ -230,7 +230,7 @@ # rm -rf doc.git </pre> - <p>On workstation edit conf/gitolite.conf and remove c9-doc.</p> + <p>On workstation edit conf/gitolite.conf and remove doc.</p> <h2 id="hooks">4. Gitolite Hooks</h2> @@ -472,14 +472,14 @@ <pre> $ git add local/hooks/repo-specific/hook-deployweb - $ git add -u && git commit -m "added deploy c9 hook" + $ git add -u && git commit -m "added deploy hook" </pre> - <p>Now we can test if our script is functioning by creating a branch on c9-doc + <p>Now we can test if our script is functioning by creating a branch on doc making a random change and push;<p> <pre> - $ cd c9-doc + $ cd doc $ git checkout -b deploy_branch </pre> diff --git a/tools/gnupg.html b/tools/gnupg.html index 54b74d3..48ffbcb 100644 --- a/tools/gnupg.html +++ b/tools/gnupg.html @@ -77,10 +77,10 @@ GnuPG needs to construct a user ID to identify your key. Real name: User Name - Email address: user@core.privat-server.net + Email address: user@machine.example.org Comment: user at external dot org You selected this USER-ID: - "User Name (user at core) <user@core.privat-server.net>" + "User Name (user at core) <user@machine.example.org>" Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? O </pre> @@ -101,7 +101,7 @@ /home/droid/.gnupg/pubring.kbx ------------------------------ pub dsa3072/EE29B7D3 2016-05-30 [SC] [expires: 2017-05-30] - uid [ultimate] User Name (user at core ) <user@core.privat-server.net> + uid [ultimate] User Name (user at core ) <user@machine.example.org> sub elg2112/9BC2DC12 2016-05-30 [E] [expires: 2017-05-30] </pre> @@ -296,7 +296,7 @@ <p> This is part of the Hive System Documentation. - Copyright (C) 2018 + Copyright (C) 2019 Hive Team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> </body> diff --git a/tools/mutt.html b/tools/mutt.html index 28c9e0c..63e83ad 100644 --- a/tools/mutt.html +++ b/tools/mutt.html @@ -177,7 +177,7 @@ set folder="~/.mail" set mbox_type=Maildir - set spoolfile=/var/spool/mail/c9admin + set spoolfile=/var/spool/mail/machine-admin set keep_flagged=yes set mbox="~/.mail" # ~/.mailext/read_inbox @@ -196,8 +196,8 @@ unset pop_host unset smtp_url - set realname='c9admin' - set from=c9admin@localhost + set realname='machine-admin' + set from=machine-admin@localhost </pre> <p>Create folder;</p> diff --git a/tools/network.html b/tools/network.html index 9e6821e..6f9e941 100644 --- a/tools/network.html +++ b/tools/network.html @@ -46,7 +46,7 @@ FONT=default KEYMAP=dvorak TIMEZONE="Europe/Lisbon" - HOSTNAME=c9 + HOSTNAME=machine SYSLOG=sysklogd SERVICES=(lo iptables wlan blan crond) diff --git a/tools/nginx.html b/tools/nginx.html index d64356d..2bddaf3 100644 --- a/tools/nginx.html +++ b/tools/nginx.html @@ -51,7 +51,7 @@ #ACME challenge location ^~ /.well-known { allow all; - alias /srv/www/c9-pmwiki/pub/cert/.well-known/; + alias /srv/www/machine-pmwiki/pub/cert/.well-known/; default_type "text/plain"; try_files $uri =404; } @@ -60,11 +60,11 @@ <p>First run dryrun to test if everything is ok;</p> <pre> - # certbot certonly --dry-run --email user@mail.org --webroot -w /srv/www/c9-pmwiki/pub/cert/-d example.sub.domain + # certbot certonly --dry-run --email user@mail.org --webroot -w /srv/www/machine-pmwiki/pub/cert/-d machine.example.org </pre> <pre> - # certbot certonly --email user@mail.org --webroot -w /srv/www/c9-pmwiki/pub/cert/-d example.sub.domain + # certbot certonly --email user@mail.org --webroot -w /srv/www/machine-pmwiki/pub/cert/-d machine.example.org </pre> <h3 id="mancert">2.2. Self certificate</h2> @@ -103,7 +103,7 @@ 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-network.net + Common Name (e.g. server FQDN or YOUR name) []:machine.example.org Email Address []: Please enter the following 'extra' attributes @@ -142,7 +142,7 @@ </pre> Signature ok - subject=/C=PT/ST=Some-State/O=Internet Widgits Pty Ltd/CN=core.privat-network.net + subject=/C=PT/ST=Some-State/O=Internet Widgits Pty Ltd/CN=machine.example.org Getting Private key Enter pass phrase for /etc/ssl/keys/nginx.key: </pre> @@ -282,19 +282,19 @@ <p> This server is configured in a way that root serves pmwiki and /tasks serves flyspray. In order to - flyspray to link correctly change index is needed. Create /etc/nginx/sites-enabled/example.sub.domain.conf;</p> + flyspray to link correctly change index is needed. Create /etc/nginx/sites-enabled/machine.example.org.conf;</p> <pre> server { listen 443 ssl; listen 80; - server_name example.sub.domain; + server_name machine.example.org; # listen [::]:443 ssl http2; - ssl_certificate /etc/letsencrypt/live/example.sub.domain/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/example.sub.domain/privkey.pem; - ssl_trusted_certificate /etc/letsencrypt/live/example.sub.domain/chain.pem; + ssl_certificate /etc/letsencrypt/live/machine.example.org/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/machine.example.org/privkey.pem; + ssl_trusted_certificate /etc/letsencrypt/live/machine.example.org/chain.pem; ssl_session_timeout 1d; ssl_session_cache shared:SSL:50m; diff --git a/tools/nmap.html b/tools/nmap.html index 0f0f1b4..f80a6a6 100644 --- a/tools/nmap.html +++ b/tools/nmap.html @@ -24,7 +24,7 @@ <p>Or by hostname;</p> <pre> - # nmap -v hive.gnu.systems + # nmap -v machine.example.org </pre> <p>Check OS and version detection;</p> diff --git a/tools/openssh.html b/tools/openssh.html index e1748d7..7c627b6 100644 --- a/tools/openssh.html +++ b/tools/openssh.html @@ -208,8 +208,8 @@ this example the public key will be copied using scp;</p> <pre> - $ scp /home/bob/.ssh/id_rsa.pub admin@core.privat-network.net:/home/admin/.ssh/ - bob@core.privat-network.net's password: + $ scp /home/bob/.ssh/id_rsa.pub admin@machine.example.org:/home/admin/.ssh/ + bob@machine.example.org's password: id_rsa.pub 100% 390 0.4KB/s 00:00 </pre> @@ -234,25 +234,25 @@ <pre> Host core - Hostname core.privat-network.net + Hostname machine.example.org IdentityFile ~/.ssh/id_rsa Port 2222 User admin Host git - Hostname core.privat-network.net + Hostname machine.example.org IdentityFile ~/.ssh/id_rsa Port 2222 User gitolite Host git-admin - Hostname core.privat-network.net + Hostname machine.example.org IdentityFile ~/.ssh/gitolite Port 2222 User gitolite </pre> - <p>Now you can just type ssh core to connect core.privat-network.net on + <p>Now you can just type ssh core to connect machine.example.org on port 2222 with ~/.ssh/id_rsa as identity, or to connect to git server as gitolite admin;</p> diff --git a/tools/postgresql.html b/tools/postgresql.html index b68323a..00fe1ae 100644 --- a/tools/postgresql.html +++ b/tools/postgresql.html @@ -84,7 +84,7 @@ 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-network.net + Common Name (e.g. server FQDN or YOUR name) []:machine.example.org Email Address []: Please enter the following 'extra' attributes diff --git a/tools/qemu.html b/tools/qemu.html index 5c44bad..d6c1738 100644 --- a/tools/qemu.html +++ b/tools/qemu.html @@ -23,7 +23,7 @@ <p>Add users to kvm group;</p> <pre> - # usermod -a -G kvm c9admin + # usermod -a -G kvm machine-admin # usermod -a -G kvm username </pre> diff --git a/tools/squid.html b/tools/squid.html index e8f1b0f..fcbe7bd 100644 --- a/tools/squid.html +++ b/tools/squid.html @@ -22,17 +22,17 @@ http://roberts.bplaced.net/index.php/linux-guides/centos-6-guides/proxy-server/s <pre> # Generate Private Key -openssl genrsa -out core.privat-network.net.key 2048 +openssl genrsa -out machine.example.org.key 2048 </pre> <pre> # Create Certificate Signing Request -openssl req -new -key core.privat-network.net.key -out core.privat-network.net.csr +openssl req -new -key machine.example.org.key -out machine.example.org.csr </pre> <pre> # Sign Certificate -openssl x509 -req -days 3652 -in core.privat-network.net.csr -signkey core.privat-network.net.key -out core.privat-network.net.cert +openssl x509 -req -days 3652 -in machine.example.org.csr -signkey machine.example.org.key -out machine.example.org.cert cat squid.key squid.crt > squid.pem @@ -56,7 +56,7 @@ chown -R squid.squid /var/lib/ssl_db # Proxy Aware (non-intercepted traffic) http_port 192.168.0.1:3128 ssl-bump cert=/etc/squid/example.com.cert key=/etc/squid/example.com.private generate-host-certificates=on version=1 options=NO_SSLv2,NO_SSLv3,SINGLE_DH_USE # Intercepted Traffic -https_port 192.168.0.1:3130 cert=/etc/squid/ssl/core.privat-network.net.cert key=/etc/squid/core.privat-network.net.key ssl-bump intercept generate-host-certificates=on version=1 options=NO_SSLv2,NO_SSLv3,SINGLE_DH_USE +https_port 192.168.0.1:3130 cert=/etc/squid/ssl/machine.example.org.cert key=/etc/squid/machine.example.org.key ssl-bump intercept generate-host-certificates=on version=1 options=NO_SSLv2,NO_SSLv3,SINGLE_DH_USE # SSL Bump Config |