summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenry Gebhardt <hsggebhardt@gmail.com>2013-09-04 09:43:27 -0400
committerHenry Gebhardt <hsggebhardt@gmail.com>2013-09-04 09:43:27 -0400
commit38404fdf7bf55a44eff7c11932854ff48869a5e7 (patch)
treeb1c657fd8865c5d649f616937d33402cc6b981e7
parentsys-apps/systemd-units-20: serivces-basic no longer exists (diff)
downloadsystemd-38404fdf7bf55a44eff7c11932854ff48869a5e7.tar.gz
systemd-38404fdf7bf55a44eff7c11932854ff48869a5e7.tar.bz2
systemd-38404fdf7bf55a44eff7c11932854ff48869a5e7.zip
sys-apps/systemd-units-21: remove vsftpd@, mysqld, tmpfiles.d are all gone
-rw-r--r--sys-apps/systemd-units/files/services-server/mysqld.service13
-rw-r--r--sys-apps/systemd-units/files/services-server/vsftpd.socket9
-rw-r--r--sys-apps/systemd-units/files/services-server/vsftpd_at.service10
-rw-r--r--sys-apps/systemd-units/files/tmpfiles-server/mysqld.conf4
-rw-r--r--sys-apps/systemd-units/systemd-units-21.ebuild (renamed from sys-apps/systemd-units/systemd-units-20.ebuild)1
5 files changed, 0 insertions, 37 deletions
diff --git a/sys-apps/systemd-units/files/services-server/mysqld.service b/sys-apps/systemd-units/files/services-server/mysqld.service
deleted file mode 100644
index 5230736..0000000
--- a/sys-apps/systemd-units/files/services-server/mysqld.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=mySQL Server
-After=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/sbin/mysqld --defaults-file=/etc/mysql/my.cnf --basedir=/usr --datadir=/var/lib/mysql --pid-file=/var/run/mysqld/mysqld.pid --socket=/var/run/mysqld/mysqld.sock
-ExecStop=/bin/kill -15 $MAINPID
-PIDFile=/var/run/mysqld/mysql.pid
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-apps/systemd-units/files/services-server/vsftpd.socket b/sys-apps/systemd-units/files/services-server/vsftpd.socket
deleted file mode 100644
index cdc0d33..0000000
--- a/sys-apps/systemd-units/files/services-server/vsftpd.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Conflicts=vsftpd.service
-
-[Socket]
-ListenStream=21
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/sys-apps/systemd-units/files/services-server/vsftpd_at.service b/sys-apps/systemd-units/files/services-server/vsftpd_at.service
deleted file mode 100644
index 5380b83..0000000
--- a/sys-apps/systemd-units/files/services-server/vsftpd_at.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Very Secure FTP Daemon
-
-[Service]
-Type=simple
-# Note: Do not use ExecStartPre=/usr/libexec/vsftpd-checkconfig.sh, as it
-# requires one of the listen options to be enabled.
-ExecStart=/usr/sbin/vsftpd /etc/vsftpd/vsftpd.conf -obackground=NO -olisten=NO -olisten_ipv6=NO
-StandardInput=socket
-SuccessExitStatus=2
diff --git a/sys-apps/systemd-units/files/tmpfiles-server/mysqld.conf b/sys-apps/systemd-units/files/tmpfiles-server/mysqld.conf
deleted file mode 100644
index f88d41d..0000000
--- a/sys-apps/systemd-units/files/tmpfiles-server/mysqld.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# systemd tmpfile settings for mysql
-# See tmpfiles.d(5) for details
-
-d /var/run/mysqld 0755 mysql mysql -
diff --git a/sys-apps/systemd-units/systemd-units-20.ebuild b/sys-apps/systemd-units/systemd-units-21.ebuild
index 9487fe6..77f2c5e 100644
--- a/sys-apps/systemd-units/systemd-units-20.ebuild
+++ b/sys-apps/systemd-units/systemd-units-21.ebuild
@@ -20,7 +20,6 @@ DEPEND=""
src_install() {
if use server; then
systemd_dounit "${FILESDIR}"/services-server/*
- systemd_dotmpfilesd "${FILESDIR}"/tmpfiles-server/*
(
insinto /etc/kernel/postinst.d/
doins "${FILESDIR}"/90_kexec