From 3f41600d17ca68bc61e19e1e164c08ca2dc047c8 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Wed, 28 Feb 2018 17:58:32 +0000 Subject: openntpd only on servers, timedatectl does timesync for everything else --- virtual/miller-base/Manifest | 2 +- virtual/miller-base/miller-base-10.6.1.ebuild | 126 ++++++++++++++++++++++++ virtual/miller-base/miller-base-10.6.ebuild | 127 ------------------------- virtual/random-server/Manifest | 2 +- virtual/random-server/random-server-0.1.ebuild | 52 ++++++++++ virtual/random-server/random-server-0.ebuild | 51 ---------- 6 files changed, 180 insertions(+), 180 deletions(-) create mode 100644 virtual/miller-base/miller-base-10.6.1.ebuild delete mode 100644 virtual/miller-base/miller-base-10.6.ebuild create mode 100644 virtual/random-server/random-server-0.1.ebuild delete mode 100644 virtual/random-server/random-server-0.ebuild diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest index 38560cd..b06c3dc 100644 --- a/virtual/miller-base/Manifest +++ b/virtual/miller-base/Manifest @@ -10,4 +10,4 @@ AUX update-install2 683 BLAKE2B 22d9b0ee5bf4af8f0ababf8228d1d0b72f52d63eb9c513fa AUX update.portage.cron-2 48 BLAKE2B 3dfc6ccfc76500300af4c08eab46f309817fe1b50d0aceaad14e05f73fec23146eb9dcedb53c3db78b222f80530fde7533052253fad80eca0f9c6831ad939955 SHA512 431d8ed50c2fc6d4b0e9e3550e4ba5d8320595961c6dab14820ae7b5abd39bf63cb6afb99724f2b4aebb2c0cf14b46927d2abecb6d9509db158000b8ea6a97b8 AUX weekly-av-scan.cron 1215 BLAKE2B a69994fc9595a338f2deb9a9a050b2c5e5b6a62cb4776bf48e81575dad87721fac4da82ec2ea83034164fbeb8cff9f9cd3b7cb7716f68ee3d70a94735aed8906 SHA512 3da4781490a1703c0a00884e0a3a053b4a65207a5cb1320418cce02a10fd2c8802d6516cd22080b32d2a36212adbf4b5e471623019997dfddfe6cc1c15bf64a6 AUX write-new-updates 409 BLAKE2B 8fef840edaa32393788c02060350dded10a9d737ac1ad7c4cae1a0428ec823d64d3c7dd2c0efa20b4cd6641efc0ac55face9b40e9cc0a0b90dbe5b0536fb79c3 SHA512 5f6b852ec563f764617d747c3024a89044e409345b599e5476963573f4ef639fcf67c7eadc0cc12857c7e3c0be59a2b912d1d06a10c647c5af61cefd182ff1a5 -EBUILD miller-base-10.6.ebuild 3771 BLAKE2B 4d3fa5afc22eeae67265d850669ecb3108e58cd1f7a5969e4ed7fb3279abfc7f817e1ffdff7f21d026e44b1e574b31941f8f05b8778b227f32f639e274b93032 SHA512 c4607b66db6017d5135bc47884b8143baef6f88cfc982df1af90234241575978b57d24896d5a87d9ac5c1ccd307ffb4e263a4d71055ba03a57ea94c419e17f1c +EBUILD miller-base-10.6.1.ebuild 3731 BLAKE2B e9df0512e39baed92421b10c8231e797d89fd4d84faebd15da697fbec376f3f7d75d68f43318bfd19af2013727351fdc2cc508297550756a2f8a8643f87e610a SHA512 fada5a1fe5c07ecd60c2557dbe87a2d4c249423d34950cb4e58a73febd832f715d69d4d8ca79d515538f67933ef0f0c0a658ece092c6ecb8572d11c785a74dab diff --git a/virtual/miller-base/miller-base-10.6.1.ebuild b/virtual/miller-base/miller-base-10.6.1.ebuild new file mode 100644 index 0000000..a1d3219 --- /dev/null +++ b/virtual/miller-base/miller-base-10.6.1.ebuild @@ -0,0 +1,126 @@ +EAPI="6" +inherit systemd +DESCRIPTION="Virtual for base systems" + +SLOT="0" +KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd" +IUSE="cdr hardened nohourlyupdate fuse xfs btrfs bash-completion git samba +minimal autoupdate autoshutdown autoservicerestart sw-suspend raid +video_cards_nvidia video_cards_nouveau firmware ischroot" + +RDEPEND=" + app-misc/simplify + app-arch/hardlink + sys-process/htop + sys-process/iotop + sys-apps/less + fuse? ( net-fs/sshfs ) + !ischroot? ( + sys-kernel/kergen + sys-apps/ethtool + sys-cluster/netfs + sys-apps/kexec-tools + >=app-admin/eclean-kernel-1.99 + raid? ( sys-fs/mdadm ) + cdr? ( kde-apps/k3b ) + sys-apps/hdparm + xfs? ( sys-fs/xfsdump ) + btrfs? ( sys-fs/btrfs-progs ) + sys-fs/lvm2 + >=sys-boot/grub-2 + sys-apps/busybox + sys-kernel/genkernel-next + sys-process/vixie-cron + sys-apps/pciutils + sys-apps/usbutils + samba? ( || ( net-fs/cifs-utils net-fs/samba[client] ) ) + firmware? ( sys-kernel/linux-firmware ) + app-admin/logrotate + video_cards_nvidia? ( sys-apps/v86d ) + video_cards_nouveau? ( sys-firmware/nvidia-firmware ) + ) + >=app-portage/gentoolkit-0.2.1 + app-admin/sudo + mail-client/mailx + !minimal? ( + app-shells/thefuck + app-shells/hstr + x11-apps/xauth + sys-apps/moreutils + dev-util/strace + net-analyzer/netcat + net-ftp/ncftp + app-text/dos2unix + net-dns/bind-tools + !ischroot? ( + www-servers/apache + app-antivirus/clamav + ) + ) + sys-process/lsof + app-portage/layman[git] + !hardened? ( + sys-devel/prelink + ) + !ischroot? ( + !sw-suspend? ( sys-kernel/gentoo-sources ) + sw-suspend? ( sys-apps/tuxonice-userui + || ( sys-kernel/tuxonice-sources + sys-kernel/pf-sources ) ) ) + app-misc/screen + app-vim/gentoo-syntax + sys-auth/pam_ldap + sys-auth/nss_ldap + app-editors/gvim + git? ( dev-vcs/git ) + bash-completion? ( app-shells/bash-completion ) + sys-apps/systemd + autoservicerestart? ( + sys-apps/autorestart + ) + " + +src_unpack() { + mkdir ${S} +} + +src_install() { + exeinto /etc/cron.hourly + newexe "${FILESDIR}"/service-check.systemd service-check + systemd_newtmpfilesd "${FILESDIR}/tmpfiles-d-portage.conf" "portage.conf" + dodir /etc/systemd/system/multi-user.target.wants + dosym /lib/systemd/system/freshclamd.service /etc/systemd/system/multi-user.target.wants/freshclamd.service + dosym /lib/systemd/system/nscd.service /etc/systemd/system/multi-user.target.wants/nscd.service + dosym /lib/systemd/system/sshd.service /etc/systemd/system/multi-user.target.wants/sshd.service + dosym /lib/systemd/system/vixie-cron.service /etc/systemd/system/multi-user.target.wants/vixie-cron.service + + exeinto /etc/cron.weekly + use !minimal && newexe "${FILESDIR}"/weekly-av-scan.cron av-scan + use !minimal && newexe "${FILESDIR}"/kernels-cleaner kernels-cleaner + + if [ -n "${UPDATETIME}" ]; then + mkdir -p ${D}/etc/cron.d + echo "${UPDATETIME} root /sbin/gentoo-portage-update" > ${D}/etc/cron.d/gentoo-portage-update + exeinto /sbin + else + use nohourlyupdate && exeinto /etc/cron.daily + use !nohourlyupdate && exeinto /etc/cron.hourly + fi + newexe "${FILESDIR}"/update.portage.cron-2 gentoo-portage-update + + exeinto /etc/portage/postsync.d/ + newexe "${FILESDIR}"/sync-distclean-exec.cron 60-portage-distclean-exec + use !autoupdate && newexe "${FILESDIR}"/auto-download-packages 70-auto-download-package + newexe "${FILESDIR}"/write-new-updates 50-write-new-updates + newexe "${FILESDIR}"/newkernel 80-newkernel + newexe "${FILESDIR}"/systemd-reload 90-systemd-reload + if use autoupdate ; then + dosym /sbin/update-install /etc/portage/postsync.d/75-update-install + if use autoshutdown ; then + newexe "${FILESDIR}"/update-autoshutdown 99-auto-shutdown + fi + fi + + exeinto /sbin + newexe "${FILESDIR}"/update-install2 update-install +} diff --git a/virtual/miller-base/miller-base-10.6.ebuild b/virtual/miller-base/miller-base-10.6.ebuild deleted file mode 100644 index 99c7a39..0000000 --- a/virtual/miller-base/miller-base-10.6.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -EAPI="6" -inherit systemd -DESCRIPTION="Virtual for base systems" - -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd" -IUSE="cdr hardened nohourlyupdate fuse xfs btrfs bash-completion git samba -minimal autoupdate autoshutdown autoservicerestart sw-suspend raid -video_cards_nvidia video_cards_nouveau firmware ischroot" - -RDEPEND=" - app-misc/simplify - app-arch/hardlink - sys-process/htop - sys-process/iotop - sys-apps/less - fuse? ( net-fs/sshfs ) - !ischroot? ( - sys-kernel/kergen - sys-apps/ethtool - sys-cluster/netfs - sys-apps/kexec-tools - >=app-admin/eclean-kernel-1.99 - raid? ( sys-fs/mdadm ) - cdr? ( kde-apps/k3b ) - sys-apps/hdparm - xfs? ( sys-fs/xfsdump ) - btrfs? ( sys-fs/btrfs-progs ) - sys-fs/lvm2 - >=sys-boot/grub-2 - sys-apps/busybox - sys-kernel/genkernel-next - sys-process/vixie-cron - sys-apps/pciutils - sys-apps/usbutils - || ( net-misc/openntpd net-misc/ntp ) - samba? ( || ( net-fs/cifs-utils net-fs/samba[client] ) ) - firmware? ( sys-kernel/linux-firmware ) - app-admin/logrotate - video_cards_nvidia? ( sys-apps/v86d ) - video_cards_nouveau? ( sys-firmware/nvidia-firmware ) - ) - >=app-portage/gentoolkit-0.2.1 - app-admin/sudo - mail-client/mailx - !minimal? ( - app-shells/thefuck - app-shells/hstr - x11-apps/xauth - sys-apps/moreutils - dev-util/strace - net-analyzer/netcat - net-ftp/ncftp - app-text/dos2unix - net-dns/bind-tools - !ischroot? ( - www-servers/apache - app-antivirus/clamav - ) - ) - sys-process/lsof - app-portage/layman[git] - !hardened? ( - sys-devel/prelink - ) - !ischroot? ( - !sw-suspend? ( sys-kernel/gentoo-sources ) - sw-suspend? ( sys-apps/tuxonice-userui - || ( sys-kernel/tuxonice-sources - sys-kernel/pf-sources ) ) ) - app-misc/screen - app-vim/gentoo-syntax - sys-auth/pam_ldap - sys-auth/nss_ldap - app-editors/gvim - git? ( dev-vcs/git ) - bash-completion? ( app-shells/bash-completion ) - sys-apps/systemd - autoservicerestart? ( - sys-apps/autorestart - ) - " - -src_unpack() { - mkdir ${S} -} - -src_install() { - exeinto /etc/cron.hourly - newexe "${FILESDIR}"/service-check.systemd service-check - systemd_newtmpfilesd "${FILESDIR}/tmpfiles-d-portage.conf" "portage.conf" - dodir /etc/systemd/system/multi-user.target.wants - dosym /lib/systemd/system/freshclamd.service /etc/systemd/system/multi-user.target.wants/freshclamd.service - dosym /lib/systemd/system/nscd.service /etc/systemd/system/multi-user.target.wants/nscd.service - dosym /lib/systemd/system/sshd.service /etc/systemd/system/multi-user.target.wants/sshd.service - dosym /lib/systemd/system/vixie-cron.service /etc/systemd/system/multi-user.target.wants/vixie-cron.service - - exeinto /etc/cron.weekly - use !minimal && newexe "${FILESDIR}"/weekly-av-scan.cron av-scan - use !minimal && newexe "${FILESDIR}"/kernels-cleaner kernels-cleaner - - if [ -n "${UPDATETIME}" ]; then - mkdir -p ${D}/etc/cron.d - echo "${UPDATETIME} root /sbin/gentoo-portage-update" > ${D}/etc/cron.d/gentoo-portage-update - exeinto /sbin - else - use nohourlyupdate && exeinto /etc/cron.daily - use !nohourlyupdate && exeinto /etc/cron.hourly - fi - newexe "${FILESDIR}"/update.portage.cron-2 gentoo-portage-update - - exeinto /etc/portage/postsync.d/ - newexe "${FILESDIR}"/sync-distclean-exec.cron 60-portage-distclean-exec - use !autoupdate && newexe "${FILESDIR}"/auto-download-packages 70-auto-download-package - newexe "${FILESDIR}"/write-new-updates 50-write-new-updates - newexe "${FILESDIR}"/newkernel 80-newkernel - newexe "${FILESDIR}"/systemd-reload 90-systemd-reload - if use autoupdate ; then - dosym /sbin/update-install /etc/portage/postsync.d/75-update-install - if use autoshutdown ; then - newexe "${FILESDIR}"/update-autoshutdown 99-auto-shutdown - fi - fi - - exeinto /sbin - newexe "${FILESDIR}"/update-install2 update-install -} diff --git a/virtual/random-server/Manifest b/virtual/random-server/Manifest index b1f64a5..d2d0b49 100644 --- a/virtual/random-server/Manifest +++ b/virtual/random-server/Manifest @@ -1 +1 @@ -EBUILD random-server-0.ebuild 1003 BLAKE2B eaf16e4eb0d887637ec8406e59e96356e1ed88d9b537b2e854e9528ede7d8b162e51d25caff017369a3dddbe889b6f317bd9228a60da006dd3b42464cd8284f8 SHA512 4841b9c654b4eae17aa4cc26595f8a446e8058b084a7307668f32f2478e23fa1c5477c54f0fbcb38c37aeb5c4227795d9594475bd37f6478c9d7989f9a20d648 +EBUILD random-server-0.1.ebuild 1022 BLAKE2B 704447f6e3230b33ee530497466813c5e44ae7140cff66bc4dcd6d3a84740ee66f248bf595a183cda39d2940e161602f452483191e694e08d9273d4e59d03a62 SHA512 4b38466e6235cc53b746774404db2a40eb5dbe86fd8bf2086da863e9ae531194d7246450afec3ca03b7a90d03331783e9c398333c24099210cbbed4a822450d5 diff --git a/virtual/random-server/random-server-0.1.ebuild b/virtual/random-server/random-server-0.1.ebuild new file mode 100644 index 0000000..94029b4 --- /dev/null +++ b/virtual/random-server/random-server-0.1.ebuild @@ -0,0 +1,52 @@ +EAPI=3 + +DESCRIPTION="Virtual for Random servers" +HOMEPAGE="" +SRC_URI="" + +LICENSE="" +SLOT="0" +KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd" +IUSE="mediaserver ocfs2 ci" + +RDEPEND=" + =net-misc/unison-2.48* + =dev-lang/ocaml-4.04* + app-text/highlight + net-dns/bind + net-firewall/iptables + net-fs/samba + net-misc/dhcp + net-proxy/squid + net-proxy/haproxy + net-nds/smbldap-tools + net-nds/shelldap + virtual/miller-base + virtual/miller-mailserver + virtual/miller-postgresql + virtual/miller-webappserver + virtual/miller-webserver + www-apps/project2 + sys-apps/logwatch + sys-apps/glacier2-service + net-misc/gentoobrowse-api + dev-util/ccache + >=sys-cluster/heartbeat-3.0.6 + net-analyzer/fail2ban + net-misc/openntpd + ci? ( + virtual/ci-server + ) + ocfs2? ( + sys-apps/drbd-service + sys-cluster/drbd-utils + sys-apps/ocfs2-service + sys-fs/ocfs2-tools ) + mediaserver? ( + net-misc/minidlna + media-tv/mythtv + media-tv/mythfs + media-tv/p2pvr + net-misc/youtube-dl + net-p2p/transmission ) +" diff --git a/virtual/random-server/random-server-0.ebuild b/virtual/random-server/random-server-0.ebuild deleted file mode 100644 index b2fe916..0000000 --- a/virtual/random-server/random-server-0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -EAPI=3 - -DESCRIPTION="Virtual for Random servers" -HOMEPAGE="" -SRC_URI="" - -LICENSE="" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd" -IUSE="mediaserver ocfs2 ci" - -RDEPEND=" - =net-misc/unison-2.48* - =dev-lang/ocaml-4.04* - app-text/highlight - net-dns/bind - net-firewall/iptables - net-fs/samba - net-misc/dhcp - net-proxy/squid - net-proxy/haproxy - net-nds/smbldap-tools - net-nds/shelldap - virtual/miller-base - virtual/miller-mailserver - virtual/miller-postgresql - virtual/miller-webappserver - virtual/miller-webserver - www-apps/project2 - sys-apps/logwatch - sys-apps/glacier2-service - net-misc/gentoobrowse-api - dev-util/ccache - >=sys-cluster/heartbeat-3.0.6 - net-analyzer/fail2ban - ci? ( - virtual/ci-server - ) - ocfs2? ( - sys-apps/drbd-service - sys-cluster/drbd-utils - sys-apps/ocfs2-service - sys-fs/ocfs2-tools ) - mediaserver? ( - net-misc/minidlna - media-tv/mythtv - media-tv/mythfs - media-tv/p2pvr - net-misc/youtube-dl - net-p2p/transmission ) -" -- cgit v1.2.3