diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/conf/etc/rc.d/blan | 13 | ||||
| -rw-r--r-- | tools/conf/srv/gitolite/gitolite.conf | 6 | ||||
| -rw-r--r-- | tools/dnsmasq.html | 2 | ||||
| -rw-r--r-- | tools/fail2ban.html | 2 | ||||
| -rw-r--r-- | tools/gitolite.html | 2 | ||||
| -rw-r--r-- | tools/gnupg.html | 2 | ||||
| -rw-r--r-- | tools/index.html | 2 | ||||
| -rw-r--r-- | tools/logrotate.html | 2 | ||||
| -rw-r--r-- | tools/lvm.html | 2 | ||||
| -rw-r--r-- | tools/lynx.html | 2 | ||||
| -rw-r--r-- | tools/mutt.html | 2 | ||||
| -rw-r--r-- | tools/network.html | 2 | ||||
| -rw-r--r-- | tools/nginx.html | 2 | ||||
| -rw-r--r-- | tools/openssh.html | 2 | ||||
| -rw-r--r-- | tools/postgresql.html | 2 | ||||
| -rw-r--r-- | tools/qemu.html | 80 | ||||
| -rw-r--r-- | tools/scripts/pkgmk-test.sh | 2 | ||||
| -rw-r--r-- | tools/scripts/setup-x.sh | 96 | ||||
| -rw-r--r-- | tools/squid.html | 2 | ||||
| -rw-r--r-- | tools/storage.html | 2 | ||||
| -rw-r--r-- | tools/syslog-ng.html | 2 | ||||
| -rw-r--r-- | tools/tar.html | 2 | ||||
| -rw-r--r-- | tools/vim.html | 2 | ||||
| -rw-r--r-- | tools/x.html | 5 |
24 files changed, 169 insertions, 69 deletions
diff --git a/tools/conf/etc/rc.d/blan b/tools/conf/etc/rc.d/blan index 56d1809..61ac2d6 100755 --- a/tools/conf/etc/rc.d/blan +++ b/tools/conf/etc/rc.d/blan @@ -1,14 +1,16 @@ #!/bin/sh # -# /etc/rc.d/net: start/stop network interface +# /etc/rc.d/blan: start/stop virtual network interfaces # DEV="br0" PHY="enp8s0" -ADDR=10.0.0.1 -NET=10.0.0.0 -MASK=24 +ADDR=10.0.0.254 +#ADDR=10.0.1.254 +MASK=8 +#GW=10.0.0.1 +GW=192.168.1.254 # one tap for each cpu core NTAPS=$((`/usr/bin/nproc`)) @@ -20,6 +22,7 @@ case $1 in /sbin/ip link set dev ${DEV} up /bin/sleep 0.2s + # Add network to virtual bridge /sbin/ip link set dev ${PHY} down /bin/sleep 0.1s /sbin/ip route flush dev ${PHY} @@ -28,7 +31,7 @@ case $1 in /bin/sleep 0.2s /sbin/ip link set dev ${PHY} master ${DEV} - #/sbin/ip route add default via ${GW} + /sbin/ip route add default via ${GW} for i in `/usr/bin/seq $NTAPS` do diff --git a/tools/conf/srv/gitolite/gitolite.conf b/tools/conf/srv/gitolite/gitolite.conf index 09133ec..e7573dd 100644 --- a/tools/conf/srv/gitolite/gitolite.conf +++ b/tools/conf/srv/gitolite/gitolite.conf @@ -33,11 +33,11 @@ repo gitolite-admin RW+ = gitolite repo c9-doc c9-ports c9-pmwiki c9-assistant - config gitweb.owner = "c9 team" + config gitweb.owner = "Hive Team" config gitweb.category = "c9" repo linux-pck - config gitweb.owner = "c9 team" + config gitweb.owner = "Hive Team" config gitweb.category = "mirrors" repo opt core contrib @@ -56,7 +56,7 @@ repo c9-pmwiki option hook.post-receive = deploy-web-doc repo c9-assistant - config gitweb.owner = "c9 team" + config gitweb.owner = "Hive Team" config gitweb.description = "c9 open assistant" repo core diff --git a/tools/dnsmasq.html b/tools/dnsmasq.html index a3b3ea8..32480d6 100644 --- a/tools/dnsmasq.html +++ b/tools/dnsmasq.html @@ -70,7 +70,7 @@ <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> </html> diff --git a/tools/fail2ban.html b/tools/fail2ban.html index 46c909c..62f8c45 100644 --- a/tools/fail2ban.html +++ b/tools/fail2ban.html @@ -48,7 +48,7 @@ <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> </html> diff --git a/tools/gitolite.html b/tools/gitolite.html index cfb443b..a7a48a5 100644 --- a/tools/gitolite.html +++ b/tools/gitolite.html @@ -827,7 +827,7 @@ <a href="index.html">Tools 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/tools/gnupg.html b/tools/gnupg.html index b009725..54b74d3 100644 --- a/tools/gnupg.html +++ b/tools/gnupg.html @@ -297,7 +297,7 @@ <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> </html> diff --git a/tools/index.html b/tools/index.html index 6c608e4..e2eef45 100644 --- a/tools/index.html +++ b/tools/index.html @@ -170,7 +170,7 @@ <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/tools/logrotate.html b/tools/logrotate.html index 2228c62..b120741 100644 --- a/tools/logrotate.html +++ b/tools/logrotate.html @@ -157,7 +157,7 @@ <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> diff --git a/tools/lvm.html b/tools/lvm.html index 347e502..497ce01 100644 --- a/tools/lvm.html +++ b/tools/lvm.html @@ -160,7 +160,7 @@ <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/tools/lynx.html b/tools/lynx.html index 618e482..039d2fa 100644 --- a/tools/lynx.html +++ b/tools/lynx.html @@ -9,7 +9,7 @@ <pre> # Description: Text-based web browser. # URL: http://lynx.isc.org/ - # Packager: c9 team, silvino at bk dot ru + # Packager: Hive Team, silvino at bk dot ru # Depends on: ncurses openssl zlib name=lynx diff --git a/tools/mutt.html b/tools/mutt.html index 5597600..28c9e0c 100644 --- a/tools/mutt.html +++ b/tools/mutt.html @@ -313,7 +313,7 @@ <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/tools/network.html b/tools/network.html index ba78bac..9e6821e 100644 --- a/tools/network.html +++ b/tools/network.html @@ -68,7 +68,7 @@ <a href="index.html">Tools 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> diff --git a/tools/nginx.html b/tools/nginx.html index 9c735ea..7094ac7 100644 --- a/tools/nginx.html +++ b/tools/nginx.html @@ -394,7 +394,7 @@ <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/tools/openssh.html b/tools/openssh.html index f257f9c..e1748d7 100644 --- a/tools/openssh.html +++ b/tools/openssh.html @@ -303,7 +303,7 @@ <a href="index.html">Tools 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> diff --git a/tools/postgresql.html b/tools/postgresql.html index c5b309c..b68323a 100644 --- a/tools/postgresql.html +++ b/tools/postgresql.html @@ -318,7 +318,7 @@ <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> diff --git a/tools/qemu.html b/tools/qemu.html index a6621a1..5c44bad 100644 --- a/tools/qemu.html +++ b/tools/qemu.html @@ -43,7 +43,7 @@ this describes how to create a qcow2 type;</p> <pre> - $ qemu-img create -f qcow2 crux-img.qcow2 2000M + $ qemu-img create -f qcow2 crux-img.qcow2 15G </pre> <h3 id="mount">2.1. Mount images</h3> @@ -63,25 +63,24 @@ to use parted to create a gpt system table;</p> <pre> - parted --script ${DEV} \ - mklabel gpt \ - unit mib \ - mkpart primary 2 4 \ - set 1 bios_grub on \ - name 1 grub \ - mkpart ESP fat32 4 59 \ - set 2 boot on \ - name 2 efi \ - mkpart primary ext4 103 200 \ - name 3 boot \ - mkpart primary linux-swap 200 456 \ - name 4 swap \ - mkpart primary ext4 456 3700 \ - name 5 root \ - mkpart primary ext4 3700 4000 \ - name 6 var \ - mkpart primary ext4 4000 100% \ - name 7 home + parted --script ${DEV} \ + mklabel gpt \ + unit mib \ + mkpart primary 2 4 \ + name 1 grub \ + mkpart ESP fat32 4 128 \ + name 2 efi \ + mkpart primary ext4 128 1128 \ + name 3 boot \ + mkpart primary ext4 1128 12128 \ + name 4 root \ + mkpart primary ext4 12128 14128 \ + name 5 var \ + mkpart primary ext4 14128 100% \ + name 6 lvm \ + set 1 bios_grub on \ + set 2 boot on \ + set 6 lvm on </pre> <pre> @@ -91,30 +90,31 @@ <p>Use /dev/mapper/$(name_of_device) to assign correct blocks;</p> <pre> - mkfs.fat -F 32 /dev/mapper/${DEV_NAME}p2 - mkfs.ext4 /dev/mapper/${DEV_NAME}p3 - mkswap /dev/mapper/${DEV_NAME}p4 - mkfs.ext4 /dev/mapper/${DEV_NAME}p5 - mkfs.ext4 /dev/mapper/${DEV_NAME}p6 - mkfs.ext4 /dev/mapper/${DEV_NAME}p7 + mkfs.fat -F 32 /dev/mapper/${DEV_NAME}p2 + mkfs.ext4 /dev/mapper/${DEV_NAME}p3 + mkfs.ext4 /dev/mapper/${DEV_NAME}p4 + mkfs.ext4 /dev/mapper/${DEV_NAME}p5 + pvcreate /dev/mapper/${DEV_NAME}p6 </pre> + <p>Read <a href="lvm.html">lvm</a> documentation on how to setup + virtual group and logic volumes.</p> + <p>Mount partition;</p> <pre> - mount /dev/mapper/${DEV_NAME}p5 $CHROOT - mkdir -p $CHROOT/proc - mkdir -p $CHROOT/sys - mkdir -p $CHROOT/dev - - mkdir -p $CHROOT/boot - mount /dev/mapper/${DEV_NAME}p3 $CHROOT/boot - mkdir -p $CHROOT/boot/efi - mount /dev/mapper/${DEV_NAME}p2 $CHROOT/boot/efi - mkdir -p $CHROOT/var - mount /dev/mapper/${DEV_NAME}p6 $CHROOT/var - mkdir -p $CHROOT/home - mount /dev/mapper/${DEV_NAME}p7 $CHROOT/home + mount /dev/mapper/${DEV_NAME}p4 $CHROOT + mkdir -p $CHROOT/proc + mkdir -p $CHROOT/sys + mkdir -p $CHROOT/dev + mkdir -p $CHROOT/media + + mkdir -p $CHROOT/boot + mount /dev/mapper/${DEV_NAME}p3 $CHROOT/boot + mkdir -p $CHROOT/boot/efi + mount /dev/mapper/${DEV_NAME}p2 $CHROOT/boot/efi + mkdir -p $CHROOT/var + mount /dev/mapper/${DEV_NAME}p5 $CHROOT/var </pre> <p>Before disconnecting image, clean dev mappings;</p> @@ -403,7 +403,7 @@ <a href="index.html">Tools 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/tools/scripts/pkgmk-test.sh b/tools/scripts/pkgmk-test.sh index a279967..4cfe2c3 100644 --- a/tools/scripts/pkgmk-test.sh +++ b/tools/scripts/pkgmk-test.sh @@ -1,5 +1,5 @@ #!/bin/bash DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" CONF=${DIR}/pkgmk-test.conf - +echo "pkgmk -cf $CONF -d -is $1" fakeroot pkgmk -cf $CONF -d -is $1 diff --git a/tools/scripts/setup-x.sh b/tools/scripts/setup-x.sh new file mode 100644 index 0000000..262b4dd --- /dev/null +++ b/tools/scripts/setup-x.sh @@ -0,0 +1,96 @@ +#!/bin/bash + +# Absolute path to this script, e.g. /home/user/bin/foo.sh +SCRIPT=$(readlink -f "$0") +# Absolute path this script is in, thus /home/user/bin +SCRIPTPATH=$(dirname "$SCRIPT") + +DIR=$(dirname "$SCRIPTPATH"); +DIR_CONF=$DIR"/conf" + + + +prt-get depinst xorg-server \ + xorg-xinit \ + xorg-xrdb \ + xorg-xdpyinfo \ + xorg-xauth \ + xorg-xmodmap \ + xorg-xrandr \ + xorg-xgamma \ + xorg-xf86-input-evdev \ + xorg-xf86-input-synaptics \ + xsel \ + xkeyboard-config + +prt-get depinst xorg-font-util \ + xorg-font-alias \ + xorg-font-dejavu-ttf \ + xorg-font-cursor-misc \ + xorg-font-misc-misc \ + console-font-terminus \ + xorg-font-terminus \ + xorg-font-mutt-misc + +prt-get search xorg-font-bitstream | xargs sudo prt-get depinst +prt-get search xorg-font-bh | xargs sudo prt-get depinst + +#prt-get search otf- | xargs sudo prt-get depinst +#prt-get depinst otf-sourcecode + +prt-get depinst \ + alsa-utils \ + libdrm \ + mesa3d \ + ffmpeg \ + gstreamer \ + gstreamer-vaapi \ + gst-plugins-base \ + gst-plugins-good \ + gst-plugins-bad \ + gst-plugins-ugly \ + cmus \ + dmenu \ + st \ + gparted \ + gimp \ + libreoffice \ + ca-certificates \ + linux-pam \ + gstreamer \ + libgd \ + icu \ + syndaemon \ + firefox + +prt-get depinst \ + openbox \ + dwm \ + spectrwm \ + mate + +ConfirmOrExit () { + while true + do + echo -n "Please confirm (y or n) :" + read CONFIRM + case $CONFIRM in + y|Y|YES|yes|Yes) break ;; + n|N|no|NO|No) + echo "Aborting - you entered $CONFIRM" + exit + ;; + *) echo "Please enter only y or n" + esac + done + echo "You entered $CONFIRM. Continuing ..." +} + +echo "SCRIPT=$SCRIPT"; +echo "SCRIPTPATH=$SCRIPTPATH"; +echo "DIR=$DIR"; +echo "DIR_CONF=$DIR_CONF"; +ConfirmOrExit + +cp -R $DIR_CONF/etc/X11/* /etc/X11/ + diff --git a/tools/squid.html b/tools/squid.html index cdf28cb..e8f1b0f 100644 --- a/tools/squid.html +++ b/tools/squid.html @@ -67,7 +67,7 @@ ssl_bump bump all <a href="index.html">Tools 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> diff --git a/tools/storage.html b/tools/storage.html index f745cc7..932e724 100644 --- a/tools/storage.html +++ b/tools/storage.html @@ -93,7 +93,7 @@ <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/tools/syslog-ng.html b/tools/syslog-ng.html index a799a16..50eaebc 100644 --- a/tools/syslog-ng.html +++ b/tools/syslog-ng.html @@ -146,7 +146,7 @@ <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> diff --git a/tools/tar.html b/tools/tar.html index 19708be..1b2c88a 100644 --- a/tools/tar.html +++ b/tools/tar.html @@ -124,7 +124,7 @@ <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> </html> diff --git a/tools/vim.html b/tools/vim.html index 15c526f..6b9ec31 100644 --- a/tools/vim.html +++ b/tools/vim.html @@ -175,7 +175,7 @@ <a href="index.html">Systools 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> diff --git a/tools/x.html b/tools/x.html index 913f1f0..79d1757 100644 --- a/tools/x.html +++ b/tools/x.html @@ -78,7 +78,8 @@ gstreamer \ libgd \ icu \ - syndaemon + syndaemon \ + firefox </pre> <h3>Window Managers</h3> @@ -252,7 +253,7 @@ <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> </html> |