From patchwork Sun Oct 4 16:45:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 526180 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 6DC471402B2 for ; Mon, 5 Oct 2015 03:45:55 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=RfMsWueG; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D2CDB8A88F; Sun, 4 Oct 2015 16:45:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ghRGw4CItDYH; Sun, 4 Oct 2015 16:45:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A0E4A89064; Sun, 4 Oct 2015 16:45:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 943311C1F5D for ; Sun, 4 Oct 2015 16:45:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8E79988FB8 for ; Sun, 4 Oct 2015 16:45:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id V8gjow-t9sFa for ; Sun, 4 Oct 2015 16:45:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9261888FB5 for ; Sun, 4 Oct 2015 16:45:49 +0000 (UTC) Received: by wiclk2 with SMTP id lk2so85696938wic.1 for ; Sun, 04 Oct 2015 09:45:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=oPaxdMDXPoIcxmr771ldzR/O0qKjlczNhhmiCUYwQ6A=; b=RfMsWueGWPry5Xfy5Hlj4ckZrrW5A9AiEK6kLGzoZ76J0GUoz97gRpi0seQnAlqus3 9A79Te4hheImP+0OySiA1Y+uYw4RY7Nszou0j9pW2K5JpA4GVsdNN4PzB2Wc4gcIPbx2 5pTqNiT8G5Nomv+dNuBjLfiu8YymQkwor5k+pMTkymvlfd++zW+TJoJzX6x6rjoLjgSq ELLD7GjGea0i+bDb2DLIpVaVEZJDVwdaT/dUDu9kxhiv3JkaSUqHSYFXb3esNVhHZRQH FJrNhwJcjLoPuIY25aEW9Z8NZXDKooK1KnHk2fToJ4nZxqHVg6zEPN4rPV+HmKZ2i99D M39A== X-Received: by 10.180.103.35 with SMTP id ft3mr7824589wib.60.1443977147987; Sun, 04 Oct 2015 09:45:47 -0700 (PDT) Received: from localhost.localdomain (LPoitiers-656-1-204-92.w80-11.abo.wanadoo.fr. [80.11.219.92]) by smtp.gmail.com with ESMTPSA id lv4sm22337634wjb.43.2015.10.04.09.45.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 04 Oct 2015 09:45:46 -0700 (PDT) From: Maxime Hadjinlian To: buildroot@busybox.net Date: Sun, 4 Oct 2015 18:45:43 +0200 Message-Id: <1443977143-21369-1-git-send-email-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 2.5.3 Subject: [Buildroot] [PATCH] vsftpd: Add systemd services X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The systemd services were taken from Arch Linux's repository: https://projects.archlinux.org/svntogit/community.git/tree/trunk?h=packages/vsftpd Signed-off-by: Maxime Hadjinlian --- package/vsftpd/vsftpd-ssl.service | 10 ++++++++++ package/vsftpd/vsftpd-ssl.socket | 9 +++++++++ package/vsftpd/vsftpd-ssl@.service | 9 +++++++++ package/vsftpd/vsftpd.mk | 17 +++++++++++++++++ package/vsftpd/vsftpd.service | 11 +++++++++++ package/vsftpd/vsftpd.socket | 9 +++++++++ package/vsftpd/vsftpd@.service | 8 ++++++++ 7 files changed, 73 insertions(+) create mode 100644 package/vsftpd/vsftpd-ssl.service create mode 100644 package/vsftpd/vsftpd-ssl.socket create mode 100644 package/vsftpd/vsftpd-ssl@.service create mode 100644 package/vsftpd/vsftpd.service create mode 100644 package/vsftpd/vsftpd.socket create mode 100644 package/vsftpd/vsftpd@.service diff --git a/package/vsftpd/vsftpd-ssl.service b/package/vsftpd/vsftpd-ssl.service new file mode 100644 index 0000000..3343bc9 --- /dev/null +++ b/package/vsftpd/vsftpd-ssl.service @@ -0,0 +1,10 @@ +[Unit] +Description=vsftpd daemon (legacy implicit SSL) + +[Service] +ExecStart=/usr/bin/vsftpd -oimplicit_ssl=yes +ExecReload=/bin/kill -HUP $MAINPID +KillMode=process + +[Install] +WantedBy=multi-user.target diff --git a/package/vsftpd/vsftpd-ssl.socket b/package/vsftpd/vsftpd-ssl.socket new file mode 100644 index 0000000..b18b639 --- /dev/null +++ b/package/vsftpd/vsftpd-ssl.socket @@ -0,0 +1,9 @@ +[Unit] +Conflicts=vsftpd.service + +[Socket] +ListenStream=990 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/package/vsftpd/vsftpd-ssl@.service b/package/vsftpd/vsftpd-ssl@.service new file mode 100644 index 0000000..8bcf78e --- /dev/null +++ b/package/vsftpd/vsftpd-ssl@.service @@ -0,0 +1,9 @@ +[Unit] +Description=vsftpd per-connection server (legacy implicit SSL) + +[Service] +ExecStart=-/usr/bin/vsftpd -oimplicit_ssl=yes +ExecReload=/bin/kill -HUP $MAINPID +StandardInput=socket +StandardOutput=socket +StandardError=syslog diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk index 1e48264..823ad66 100644 --- a/package/vsftpd/vsftpd.mk +++ b/package/vsftpd/vsftpd.mk @@ -47,6 +47,23 @@ define VSFTPD_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/vsftpd/S70vsftpd $(TARGET_DIR)/etc/init.d/S70vsftpd endef +define VSFTPD_INSTALL_INIT_SYSTEMD + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants + mkdir -p $(TARGET_DIR)/etc/systemd/system/sockets.target.wants + + for f in vsftpd.service vsftpd.socket vsftpd@.service \ + vsftpd-ssl.service vsftpd-ssl.socket vsftpd-ssl@.service; do \ + $(INSTALL) -D -m 644 package/vsftpd/$$f \ + $(TARGET_DIR)/usr/lib/systemd/system/$$f; \ + wanted_by="multi-user.target.wants"; \ + if [ $${f##*.} = "socket" ]; then \ + wanted_by="sockets.target.wants"; \ + fi; \ + ln -sf ../../../../usr/lib/systemd/system/$$f \ + $(TARGET_DIR)/etc/systemd/system/$$wanted_by/$$f; \ + done +endef + define VSFTPD_INSTALL_TARGET_CMDS $(INSTALL) -D -m 755 $(@D)/vsftpd $(TARGET_DIR)/usr/sbin/vsftpd test -f $(TARGET_DIR)/etc/vsftpd.conf || \ diff --git a/package/vsftpd/vsftpd.service b/package/vsftpd/vsftpd.service new file mode 100644 index 0000000..cc7645f --- /dev/null +++ b/package/vsftpd/vsftpd.service @@ -0,0 +1,11 @@ +[Unit] +Description=vsftpd daemon +After=network.target + +[Service] +ExecStart=/usr/bin/vsftpd +ExecReload=/bin/kill -HUP $MAINPID +KillMode=process + +[Install] +WantedBy=multi-user.target diff --git a/package/vsftpd/vsftpd.socket b/package/vsftpd/vsftpd.socket new file mode 100644 index 0000000..cdc0d33 --- /dev/null +++ b/package/vsftpd/vsftpd.socket @@ -0,0 +1,9 @@ +[Unit] +Conflicts=vsftpd.service + +[Socket] +ListenStream=21 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/package/vsftpd/vsftpd@.service b/package/vsftpd/vsftpd@.service new file mode 100644 index 0000000..81e1429 --- /dev/null +++ b/package/vsftpd/vsftpd@.service @@ -0,0 +1,8 @@ +[Unit] +Description=vsftpd per-connection server + +[Service] +ExecStart=-/usr/bin/vsftpd +ExecReload=/bin/kill -HUP $MAINPID +StandardInput=socket +StandardError=syslog