diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/conf/etc/dnsmasq.conf | 26 | ||||
-rw-r--r-- | tools/conf/etc/hosts.dnsmasq | 138 | ||||
-rwxr-xr-x | tools/conf/etc/rc.d/git-daemon | 5 | ||||
-rw-r--r-- | tools/conf/etc/ssh/sshd_config | 21 | ||||
-rw-r--r-- | tools/dnsmasq.html | 4 | ||||
-rw-r--r-- | tools/fail2ban.html | 23 | ||||
-rw-r--r-- | tools/gitolite.html | 54 | ||||
-rw-r--r-- | tools/gnupg.html | 6 | ||||
-rw-r--r-- | tools/index.html | 5 | ||||
-rw-r--r-- | tools/logrotate.html | 4 | ||||
-rw-r--r-- | tools/lvm.html | 4 | ||||
-rw-r--r-- | tools/mutt.html | 4 | ||||
-rw-r--r-- | tools/network.html | 4 | ||||
-rw-r--r-- | tools/nginx.html | 8 | ||||
-rw-r--r-- | tools/nmap.html | 2 | ||||
-rw-r--r-- | tools/openssh.html | 4 | ||||
-rw-r--r-- | tools/postgresql.html | 4 | ||||
-rw-r--r-- | tools/qemu.html | 4 | ||||
-rw-r--r-- | tools/scripts/pkgmk-test.conf | 2 | ||||
-rwxr-xr-x | tools/scripts/replace.sh | 3 | ||||
-rw-r--r-- | tools/scripts/runvm/profile/crux | 2 | ||||
-rw-r--r-- | tools/scripts/runvm/runvm.sh | 2 | ||||
-rw-r--r-- | tools/squid.html | 4 | ||||
-rw-r--r-- | tools/storage.html | 4 | ||||
-rw-r--r-- | tools/syslog-ng.html | 2 | ||||
-rw-r--r-- | tools/tar.html | 4 | ||||
-rw-r--r-- | tools/vim.html | 4 | ||||
-rw-r--r-- | tools/x.html | 4 |
28 files changed, 265 insertions, 86 deletions
diff --git a/tools/conf/etc/dnsmasq.conf b/tools/conf/etc/dnsmasq.conf index b8da62e..0bf96af 100644 --- a/tools/conf/etc/dnsmasq.conf +++ b/tools/conf/etc/dnsmasq.conf @@ -69,7 +69,9 @@ no-poll #server=127.0.0.1#40 #server=213.73.91.35 #server=37.235.1.174 -server=84.200.69.80 +#server=84.200.69.80 +#sapo +server=212.55.154.174 # Example of routing PTR queries to nameservers: this will send all # address->name queries for 192.168.3/24 to nameserver 10.1.2.3 @@ -77,12 +79,12 @@ server=84.200.69.80 # Add local-only domains here, queries in these domains are answered # from /etc/hosts or DHCP only. -local=/c9/ +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=/double-click.net/127.0.0.1 +address=/hive.gnu.systems/10.0.0.4 # --address (and --server) work with IPv6 addresses too. #address=/www.thekelleys.org.uk/fe80::20d:60ff:fe36:f83 @@ -160,8 +162,8 @@ expand-hosts # 2) Sets the "domain" DHCP option thereby potentially setting the # domain of all systems configured by DHCP # 3) Provides the domain part for "expand-hosts" -domain=c9,10.0.0.0/8 -dhcp-option=15,c9 +domain=ank,10.0.0.0/8 +dhcp-option=15,ank # Set a different domain for a particular subnet #domain=wireless.thekelleys.org.uk,192.168.2.0/24 @@ -169,6 +171,12 @@ dhcp-option=15,c9 # Same idea, but range rather then subnet #domain=reserved.thekelleys.org.uk,192.68.3.100,192.168.3.200 +address=/.akamai.net/127.0.0.1 +address=/.firefox.com/127.0.0.1 +address=/.google.com/127.0.0.1 +address=/.stripe.com/127.0.0.1 +address=/.mozilla.com/127.0.0.1 + # Uncomment this to enable the integrated DHCP server, you need # to supply the range of addresses available for lease and optionally # a lease time. If you have more than one network, you will need to @@ -249,9 +257,11 @@ dhcp-range=10.0.0.100,10.0.0.200,255.0.0.0,2h #dhcp-host=11:22:33:44:55:66,192.168.0.60 #dhcp-host=54:60:BE:EF:5C:72,10.0.0.2 -dhcp-host=50:67:f0:a1:bc:ab,cr1,10.0.0.1,infinite -dhcp-host=00:14:BF:6E:61:21,cr2,10.0.0.2,infinite -dhcp-host=54:60:BE:EF:5C:64,c14,10.0.0.4,infinite +dhcp-host=50:67:f0:a1:bc:ab,router,10.0.0.1,infinite +dhcp-host=00:14:BF:6E:61:21,lan,10.0.0.2,infinite +dhcp-host=54:60:be:ef:5c:54,c1,10.0.0.3,infinite +dhcp-host=54:60:be:ef:5c:14,c2,10.0.0.4,infinite +dhcp-host=54:60:be:ef:5c:a1,c18,10.0.0.5,infinite # Always set the name of the host with hardware address # 11:22:33:44:55:66 to be "fred" #dhcp-host=11:22:33:44:55:66,fred diff --git a/tools/conf/etc/hosts.dnsmasq b/tools/conf/etc/hosts.dnsmasq index bff9703..839863a 100644 --- a/tools/conf/etc/hosts.dnsmasq +++ b/tools/conf/etc/hosts.dnsmasq @@ -15,9 +15,147 @@ #255.255.255.255 broadcasthost #::1 localhost #fe80::1%lo0 localhost +103.5.149.90 rt.com # Custom host records are listed here. +0.0.0.0 firefox.com + +0.0.0.0 google.com +0.0.0.0 google.pt +0.0.0.0 google-analytics.com +0.0.0.0 www.google-analytics.com +0.0.0.0 ssl.google-analytics.com +0.0.0.0 www.ssl.google-analytics.com +0.0.0.0 statcounter.com +0.0.0.0 www.statcounter.com +0.0.0.0 c.statcounter.com +0.0.0.0 www.c.statcounter.com + +0.0.0.0 akamai.net +0.0.0.0 api.ak.facebook.com +0.0.0.0 api.connect.facebook.com +0.0.0.0 api.facebook.com +0.0.0.0 app.facebook.com +0.0.0.0 apps.facebook.com +0.0.0.0 ar-ar.facebook.com +0.0.0.0 badge.facebook.com +0.0.0.0 blog.facebook.com +0.0.0.0 connect.facebook.com +0.0.0.0 connect.facebook.net +0.0.0.0 de-de.facebook.com +0.0.0.0 developers.facebook.com +0.0.0.0 es-la.facebook.com +0.0.0.0 external.ak.fbcdn.net +0.0.0.0 facebook.com +0.0.0.0 facebook.de +0.0.0.0 facebook.fr +0.0.0.0 fb.me +0.0.0.0 fbcdn.net +0.0.0.0 fr-fr.facebook.com +0.0.0.0 hi-in.facebook.com +0.0.0.0 it-it.facebook.com +0.0.0.0 ja-jp.facebook.com +0.0.0.0 login.facebook.com +0.0.0.0 profile.ak.fbcdn.net +0.0.0.0 pt-br.facebook.com +0.0.0.0 ssl.connect.facebook.com +0.0.0.0 static.ak.connect.facebook.com +0.0.0.0 static.ak.fbcdn.net +0.0.0.0 www.facebook.com +0.0.0.0 www.facebook.de +0.0.0.0 www.facebook.fr +0.0.0.0 zh-cn.facebook.com +0.0.0.0 connectivitycheck.gstatic.com +0.0.0.0 api.matchinguu.com +0.0.0.0 graph.facebook.com +0.0.0.0 moto-cds.appspot.com +0.0.0.0 edge-mqtt.facebook.com +0.0.0.0 android.clients.google.com +0.0.0.0 graph.instagram.com +0.0.0.0 alt5-mtalk.google.com +0.0.0.0 e16.whatsapp.net + +# End of custom host records. +# AdAway default blocklist +# Blocking mobile ad providers and some analytics providers +# +# Contribute: +# Create an issue at https://github.com/AdAway/AdAway/issues +# +# Changelog: +# 2016-07-18 Now hosted on GitHub + Cloudflare +# 2014-05-18 Now with a valid SSL certificate available at https://adaway.org/hosts.txt +# 2013-03-29 Integrated some hosts from +# http://adblock.gjtech.net/?format=hostfile +# 2013-03-14 Back from the dead +# +# License: +# CC Attribution 3.0 (http://creativecommons.org/licenses/by/3.0/) +# +# Contributions by: +# Kicelo, Dominik Schuermann +# + + +# [General] +0.0.0.0 lb.usemaxserver.de +0.0.0.0 tracking.klickthru.com +0.0.0.0 gsmtop.net +0.0.0.0 click.buzzcity.net +0.0.0.0 ads.admoda.com +0.0.0.0 stats.pflexads.com +0.0.0.0 a.glcdn.co +0.0.0.0 wwww.adleads.com +0.0.0.0 ad.madvertise.de +0.0.0.0 apps.buzzcity.net +0.0.0.0 ads.mobgold.com +0.0.0.0 android.bcfads.com +0.0.0.0 show.buzzcity.net +0.0.0.0 api.analytics.omgpop.com +0.0.0.0 r.edge.inmobicdn.net +0.0.0.0 www.mmnetwork.mobi +0.0.0.0 img.ads.huntmad.com +0.0.0.0 creative1cdn.mobfox.com +0.0.0.0 admicro2.vcmedia.vn +0.0.0.0 admicro1.vcmedia.vn +0.0.0.0 s3.phluant.com +0.0.0.0 c.vrvm.com +0.0.0.0 go.vrvm.com +0.0.0.0 static.estebull.com +0.0.0.0 mobile.banzai.it +0.0.0.0 ads.xxxad.net +0.0.0.0 img.ads.mojiva.com +0.0.0.0 adcontent.saymedia.com +0.0.0.0 ads.saymedia.com +0.0.0.0 ftpcontent.worldnow.com +0.0.0.0 s0.2mdn.net +0.0.0.0 img.ads.mocean.mobi +0.0.0.0 bigmobileads.com +0.0.0.0 banners.bigmobileads.com +0.0.0.0 ads.mopub.com +0.0.0.0 images.mpression.net +0.0.0.0 images.millennialmedia.com +0.0.0.0 oasc04012.247realmedia.com +0.0.0.0 assets.cntdy.mobi +0.0.0.0 ad.leadboltapps.net +0.0.0.0 api.airpush.com +0.0.0.0 ad.where.com +0.0.0.0 i.tapit.com +0.0.0.0 cdn1.crispadvertising.com +0.0.0.0 google-analytics.com +0.0.0.0 www.google-analytics.com +0.0.0.0 ssl.google-analytics.com +0.0.0.0 www.ssl.google-analytics.com +0.0.0.0 statcounter.com +0.0.0.0 www.statcounter.com +0.0.0.0 c.statcounter.com +0.0.0.0 www.c.statcounter.com + + + + + 0.0.0.0 api.ak.facebook.com 0.0.0.0 api.connect.facebook.com 0.0.0.0 api.facebook.com diff --git a/tools/conf/etc/rc.d/git-daemon b/tools/conf/etc/rc.d/git-daemon index 8aa9d81..fc43cbf 100755 --- a/tools/conf/etc/rc.d/git-daemon +++ b/tools/conf/etc/rc.d/git-daemon @@ -4,9 +4,10 @@ SSD=/sbin/start-stop-daemon NAME=git-daemon PROG=$(git --exec-path)/${NAME} USER=www -GROUP=www +GROUP=gitolite PIDFILE=/var/run/git-daemon.pid -OPTS="--verbose --reuseaddr --base-path=/srv/gitolite/repositories" +REPOS=/srv/gitolite/repositories +OPTS="--verbose --reuseaddr --base-path=${REPOS}" case $1 in start) diff --git a/tools/conf/etc/ssh/sshd_config b/tools/conf/etc/ssh/sshd_config index cba9be5..6fd955a 100644 --- a/tools/conf/etc/ssh/sshd_config +++ b/tools/conf/etc/ssh/sshd_config @@ -1,4 +1,4 @@ -# $OpenBSD: sshd_config,v 1.101 2017/03/14 07:19:07 djm Exp $ +# $OpenBSD: sshd_config,v 1.100 2016/08/15 12:32:04 naddy Exp $ # This is the sshd server system-wide configuration file. See # sshd_config(5) for more information. @@ -16,6 +16,10 @@ AddressFamily inet #ListenAddress 0.0.0.0 #ListenAddress :: + +# The default requires explicit activation of protocol 1 +Protocol 2 + #HostKey /etc/ssh/ssh_host_rsa_key #HostKey /etc/ssh/ssh_host_dsa_key #HostKey /etc/ssh/ssh_host_ecdsa_key @@ -27,17 +31,18 @@ AddressFamily inet # Logging #SyslogFacility AUTH #LogLevel INFO -LogLevel VERBOSE # Authentication: -#LoginGraceTime 2m +LoginGraceTime 1m #PermitRootLogin prohibit-password +PermitRootLogin no #StrictModes yes -#MaxAuthTries 6 +MaxAuthTries 3 #MaxSessions 10 +MaxSessions 3 -#PubkeyAuthentication yes +PubkeyAuthentication yes # The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 # but this is overridden so installations will only check .ssh/authorized_keys @@ -58,10 +63,12 @@ AuthorizedKeysFile .ssh/authorized_keys # To disable tunneled clear text passwords, change to no here! #PasswordAuthentication yes +PasswordAuthentication no #PermitEmptyPasswords no # Change to no to disable s/key passwords #ChallengeResponseAuthentication yes +ChallengeResponseAuthentication no # Kerberos options #KerberosAuthentication no @@ -83,6 +90,7 @@ AuthorizedKeysFile .ssh/authorized_keys # PAM authentication, then enable this but set PasswordAuthentication # and ChallengeResponseAuthentication to 'no'. #UsePAM no +#UsePAM no #AllowAgentForwarding yes #AllowTcpForwarding yes @@ -95,6 +103,7 @@ AuthorizedKeysFile .ssh/authorized_keys #PrintLastLog yes #TCPKeepAlive yes #UseLogin no +#UsePrivilegeSeparation sandbox #PermitUserEnvironment no #Compression delayed #ClientAliveInterval 0 @@ -107,7 +116,7 @@ AuthorizedKeysFile .ssh/authorized_keys #VersionAddendum none # no default banner path -Banner /etc/issues +Banner /etc/issue # override default of no subsystems Subsystem sftp /usr/lib/ssh/sftp-server diff --git a/tools/dnsmasq.html b/tools/dnsmasq.html index 720979b..a3b3ea8 100644 --- a/tools/dnsmasq.html +++ b/tools/dnsmasq.html @@ -68,8 +68,8 @@ <a href="index.html">Tools Index</a> <p> - This is part of the c9-doc Manual. - Copyright (C) 2016 + This is part of the Hive System Documentation. + Copyright (C) 2018 c9 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/fail2ban.html b/tools/fail2ban.html index 9fad021..46c909c 100644 --- a/tools/fail2ban.html +++ b/tools/fail2ban.html @@ -2,10 +2,13 @@ <htmldir="ltr" lang="en"> <head> <meta charset='utf-8'> - <title>1. Fail2ban</title> + <title>Fail2ban</title> </head> <body> - <h1>1. Fail2ban</h1> + + <a href="index.html">Tools Index</a> + + <h1>Fail2ban</h1> <pre> $ prt-get depinst fail2ban @@ -33,5 +36,19 @@ logpath = /var/log/auth maxretry = 5 </pre> - </body> + + <p>Test a filter</p> + + <pre> + # fail2ban-regex /var/log/iptables iptables-ssh.conf + </pre> + + <a href="index.html">Tools Index</a> + + <p> + This is part of the Hive System Documentation. + Copyright (C) 2018 + c9 team. + See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> + </body> </html> diff --git a/tools/gitolite.html b/tools/gitolite.html index e7b7067..cfb443b 100644 --- a/tools/gitolite.html +++ b/tools/gitolite.html @@ -23,7 +23,16 @@ <pre> # useradd -r -s /bin/bash -U -m -d /srv/gitolite gitolite + </pre> + + <p>Permissions for /srv/gitolite/repositories directories should be + 0750/drwxr-x---.</p> + + <pre> # chown gitolite:gitolite /srv/gitolite + $ chmod -R o-rx /srv/gitolite/repositories + $ chmod -R g+rx /srv/gitolite/repositories + $ chmod -R o+r /srv/gitolite/projects.list </pre> <p>Password is necessary so the user is not @@ -33,7 +42,6 @@ <pre> # passwd gitolite </pre> - <p>Copy public key that will be used for authenticating gitolite administrator, read <a href="openssh.html#ssh">ssh</a> how to @@ -734,26 +742,19 @@ our $projects_list_group_categories = 1; </pre> - <h3>5.2. Configure nginx</h3> + <h3>5.2. Configure fcgiwrap</h3> - <p>Edit /etc/rc.d/fcgiwrap to run as www user member of www group;</p> + <p>Edit /etc/rc.d/fcgiwrap to run as www user member of gitolite group;</p> <pre> USER=www - GROUP=www + GROUP=gitolite </pre> - <p>Permissions for /srv/gitolite/repositories directories should be - 0750/drwxr-x---.</p> - - <pre> - $ chown gitolite:www /srv/gitolite - $ chown -R gitolite:www /srv/gitolite/projects.list - $ chown -R gitolite:www /srv/gitolite/repositories - </pre> + <h3>5.3. Configure nginx</h3> <p>A link from gitweb don't work under grsecurity since user www can't - follow simlink to root. Make a copy, later deploy via gitolite hook.</p> + follow simlink to root. Making a copy allows to later deploy via gitolite hook.</p> <p>Link;</p> <pre> @@ -761,6 +762,7 @@ </pre> <p>Copy;</p> + <pre> # cp -r /usr/share/gitweb /srv/www </pre> @@ -769,7 +771,7 @@ <a href="nginx.html#virtual-host">nginx virtual host</a>;</p> <pre> - location /gitweb/gitweb.cgi { + location /git/gitweb.cgi { alias /srv/www/gitweb; include fastcgi_params; gzip off; @@ -778,13 +780,13 @@ fastcgi_pass unix:/var/run/fcgiwrap.sock; } - location /gitweb { + location /git { alias /srv/www/gitweb; index gitweb.cgi; } </pre> - <h3>5.3. Configure gitolite</h3> + <h3>5.4. Configure gitolite</h3> <p>Edit <a href="conf/srv/gitolite/.gitolite.rc">/srv/gitolite/.gitolite.rc</a>, @@ -799,14 +801,6 @@ GIT_CONFIG_KEYS => '.*', </pre> - <p>Fix permissions;</p> - - <pre> - $ sudo chown -R gitolite:gitolite /srv/gitolite - $ sudo chmod g+rx /srv/gitolite/projects.list - $ sudo chmod -R 755 /srv/gitolite/repositories/ - </pre> - <p>Edit gitolite-admin/conf/gitolite.conf;</p> <pre> @@ -821,12 +815,20 @@ config gitweb.category = Projects </pre> + <h2 id="git-daemon">6. Git-daemon</h2> + + <p>Configure to run as user;</p> + + <pre> + USER=www + GROUP=gitolite + </pre> + <a href="index.html">Tools Index</a> - <p>This is part of the c9-doc Manual. + <p>This is part of the Hive System Documentation. Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> - </body> </html> diff --git a/tools/gnupg.html b/tools/gnupg.html index 21aedcb..b009725 100644 --- a/tools/gnupg.html +++ b/tools/gnupg.html @@ -51,7 +51,7 @@ <pre> $ gpg2 --full-gen-key - gpg (GnuPG) 2.1.11; Copyright (C) 2016 Free Software Foundation, Inc. + gpg (GnuPG) 2.1.11; Copyright (C) 2018 Free Software Foundation, Inc. This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. @@ -295,8 +295,8 @@ <a href="index.html">Tools Index</a> <p> - This is part of the c9-doc Manual. - Copyright (C) 2016 + This is part of the Hive System Documentation. + Copyright (C) 2018 c9 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/index.html b/tools/index.html index 2b6a4d4..6c608e4 100644 --- a/tools/index.html +++ b/tools/index.html @@ -149,6 +149,7 @@ <li><a href="gitolite.html#admin">3. Gitolite Administration</a></li> <li><a href="gitolite.html#hooks">4. Gitolite Hooks</a></li> <li><a href="gitolite.html#gitweb">5. Gitweb</a></li> + <li><a href="gitolite.html#git-daemon">6. Git-daemon</a></li> </ul> </li> <li><a href="postgresql.html">Postgresql</a> @@ -167,8 +168,8 @@ <a href="../index.html">Documentation Index</a> <p> - This is part of the c9-doc Manual. - Copyright (C) 2017 + This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/tools/logrotate.html b/tools/logrotate.html index 39da406..2228c62 100644 --- a/tools/logrotate.html +++ b/tools/logrotate.html @@ -155,8 +155,8 @@ # logrotate -f /etc/logrotate.conf </pre> - <p>This is part of the c9-doc Manual. -Copyright (C) 2016 + <p>This is part of the Hive System Documentation. +Copyright (C) 2018 c9 team. See the file <a href="fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/tools/lvm.html b/tools/lvm.html index b6c7678..347e502 100644 --- a/tools/lvm.html +++ b/tools/lvm.html @@ -158,8 +158,8 @@ <a href="index.html">Tools Index</a> <p> - This is part of the c9-doc Manual. - Copyright (C) 2016 + This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/tools/mutt.html b/tools/mutt.html index 5c72e0c..5597600 100644 --- a/tools/mutt.html +++ b/tools/mutt.html @@ -311,8 +311,8 @@ <a href="index.html">Tools Index</a> <p> - This is part of the SysDoc Manual. - Copyright (C) 2016 + This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/tools/network.html b/tools/network.html index 31ca60b..ba78bac 100644 --- a/tools/network.html +++ b/tools/network.html @@ -66,8 +66,8 @@ </pre> <a href="index.html">Tools Index</a> - <p>This is part of the c9 Manual. - Copyright (C) 2016 + <p>This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/tools/nginx.html b/tools/nginx.html index ef78ecb..9c735ea 100644 --- a/tools/nginx.html +++ b/tools/nginx.html @@ -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 c9.root.sx + # certbot certonly --dry-run --email user@mail.org --webroot -w /srv/www/c9-pmwiki/pub/cert/-d hive.gnu.systems </pre> <pre> - # certbot certonly --email user@mail.org --webroot -w /srv/www/c9-pmwiki/pub/cert/-d c9.root.sx + # certbot certonly --email user@mail.org --webroot -w /srv/www/c9-pmwiki/pub/cert/-d hive.gnu.systems </pre> <h3 id="mancert">2.2. Self certificate</h2> @@ -392,8 +392,8 @@ <a href="index.html">Tools Index</a> - <p>This is part of the c9-doc Manual. - Copyright (C) 2016 + <p>This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/tools/nmap.html b/tools/nmap.html index c3d5316..0f0f1b4 100644 --- a/tools/nmap.html +++ b/tools/nmap.html @@ -24,7 +24,7 @@ <p>Or by hostname;</p> <pre> - # nmap -v c9.root.sx + # nmap -v hive.gnu.systems </pre> <p>Check OS and version detection;</p> diff --git a/tools/openssh.html b/tools/openssh.html index c70a5f5..f257f9c 100644 --- a/tools/openssh.html +++ b/tools/openssh.html @@ -301,8 +301,8 @@ </pre> <a href="index.html">Tools Index</a> - <p>This is part of the c9-doc Manual. - Copyright (C) 2016 + <p>This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/tools/postgresql.html b/tools/postgresql.html index 155f30c..c5b309c 100644 --- a/tools/postgresql.html +++ b/tools/postgresql.html @@ -316,8 +316,8 @@ <a href="index.html">Tools Index</a> <p> - This is part of the c9-doc Manual. - Copyright (C) 2016 + This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/tools/qemu.html b/tools/qemu.html index e32d03f..e180ed4 100644 --- a/tools/qemu.html +++ b/tools/qemu.html @@ -287,7 +287,7 @@ memory=1024 boot=d tap="tap1" - iso=iso/crux-3.3.iso + iso=iso/crux-3.4.iso image=img/crux-standard.qcow2 other="-vga std -display sdl" </pre> @@ -401,7 +401,7 @@ </pre> <a href="index.html">Tools Index</a> - <p>This is part of the c9 Manual. + <p>This is part of the Hive System Documentation. Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> diff --git a/tools/scripts/pkgmk-test.conf b/tools/scripts/pkgmk-test.conf index 3b0031d..6dec896 100644 --- a/tools/scripts/pkgmk-test.conf +++ b/tools/scripts/pkgmk-test.conf @@ -4,7 +4,7 @@ source /etc/pkgmk.conf -#PKGMK_SOURCE_MIRRORS=(https://c9.root.sx/ports/distfiles/) +PKGMK_SOURCE_MIRRORS=() PKGMK_SOURCE_DIR="$PWD" PKGMK_PACKAGE_DIR="$PWD" PKGMK_WORK_DIR="$PWD/work" diff --git a/tools/scripts/replace.sh b/tools/scripts/replace.sh index e925e7d..8d5d8d9 100755 --- a/tools/scripts/replace.sh +++ b/tools/scripts/replace.sh @@ -5,4 +5,5 @@ folder=$1 oldstring=$2 newstring=$3 -grep -rl $oldstring $folder | xargs sed -i s@$oldstring@$newstring@g +#grep -rl $oldstring $folder | xargs sed -i s@$oldstring@$newstring@g +grep -rl "$oldstring" $folder | xargs sed -i "s@$oldstring@$newstring@g" diff --git a/tools/scripts/runvm/profile/crux b/tools/scripts/runvm/profile/crux index af33e1b..672b80d 100644 --- a/tools/scripts/runvm/profile/crux +++ b/tools/scripts/runvm/profile/crux @@ -2,6 +2,6 @@ mac="54:60:be:ef:5c:64" memory=1024 boot=$2 tap="tap4" -iso=iso/crux-3.3.iso +iso=iso/crux-3.4.iso image=img/c14.qcow2 other="-vga std -display sdl" diff --git a/tools/scripts/runvm/runvm.sh b/tools/scripts/runvm/runvm.sh index 1e56a52..21cd097 100644 --- a/tools/scripts/runvm/runvm.sh +++ b/tools/scripts/runvm/runvm.sh @@ -10,7 +10,7 @@ source profile/$1 #memory=1024 #boot=d #tap="tap1" -#iso=iso/crux-3.3.iso +#iso=iso/crux-3.4.iso #image=img/crux-standard.qcow2 #other="-soundhw hda -vga std -display sdl" diff --git a/tools/squid.html b/tools/squid.html index f34c2dd..cdf28cb 100644 --- a/tools/squid.html +++ b/tools/squid.html @@ -65,8 +65,8 @@ ssl_bump bump all </pre> <a href="index.html">Tools Index</a> - <p>This is part of the c9-doc Manual. - Copyright (C) 2016 + <p>This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/tools/storage.html b/tools/storage.html index 2fc95d4..f745cc7 100644 --- a/tools/storage.html +++ b/tools/storage.html @@ -91,8 +91,8 @@ <a href="index.html">Tools Index</a> <p> - This is part of the c9-doc Manual. - Copyright (C) 2016 + This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/tools/syslog-ng.html b/tools/syslog-ng.html index f1ed95b..a799a16 100644 --- a/tools/syslog-ng.html +++ b/tools/syslog-ng.html @@ -144,7 +144,7 @@ <a href="index.html">Tools Index</a> - <p>This is part of the c9-doc Manual. + <p>This is part of the Hive System Documentation. Copyright (C) 2018 c9 team. See the file <a href="fdl-1.3-standalone.html">Gnu Free Documentation License</a> diff --git a/tools/tar.html b/tools/tar.html index 1cafbb6..19708be 100644 --- a/tools/tar.html +++ b/tools/tar.html @@ -122,8 +122,8 @@ <a href="index.html">Tools Index</a> <p> - This is part of the c9-doc Manual. - Copyright (C) 2016 + This is part of the Hive System Documentation. + Copyright (C) 2018 c9 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/vim.html b/tools/vim.html index 8210681..15c526f 100644 --- a/tools/vim.html +++ b/tools/vim.html @@ -173,8 +173,8 @@ <h2 id="plugin">6. Plugins</h2> <a href="index.html">Systools Index</a> - <p>This is part of the c9-doc Manual. - Copyright (C) 2016 + <p>This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/tools/x.html b/tools/x.html index 8a68c5b..cbc9d3e 100644 --- a/tools/x.html +++ b/tools/x.html @@ -230,8 +230,8 @@ <a href="index.html">Tools Index</a> <p> - This is part of the c9-doc Manual. - Copyright (C) 2016 + This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> </body> |