From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-666211-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id C52A1138CFA
	for <garchives@archives.gentoo.org>; Sun,  9 Feb 2014 10:54:37 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 837DAE0A6E;
	Sun,  9 Feb 2014 10:54:36 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id E6890E0A6C
	for <gentoo-commits@lists.gentoo.org>; Sun,  9 Feb 2014 10:54:35 +0000 (UTC)
Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 2072D33F82B
	for <gentoo-commits@lists.gentoo.org>; Sun,  9 Feb 2014 10:54:35 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by spoonbill.gentoo.org (Postfix) with ESMTP id B7C6218852
	for <gentoo-commits@lists.gentoo.org>; Sun,  9 Feb 2014 10:54:33 +0000 (UTC)
From: "Sven Vermeulen" <swift@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" <swift@gentoo.org>
Message-ID: <1391942915.73cf057f886490de96018eef40a4b2362e0946f2.swift@gentoo>
Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/contrib/
X-VCS-Repository: proj/hardened-refpolicy
X-VCS-Files: policy/modules/contrib/couchdb.te
X-VCS-Directories: policy/modules/contrib/
X-VCS-Committer: swift
X-VCS-Committer-Name: Sven Vermeulen
X-VCS-Revision: 73cf057f886490de96018eef40a4b2362e0946f2
X-VCS-Branch: master
Date: Sun,  9 Feb 2014 10:54:33 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 13bdce28-e27f-45c6-8cec-3aeffaa419e9
X-Archives-Hash: 6b2bd8a62067f0f779aaef698abf82b5

commit:     73cf057f886490de96018eef40a4b2362e0946f2
Author:     Chris PeBenito <pebenito <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  8 14:22:34 2014 +0000
Commit:     Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 10:48:35 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=73cf057f

Move exec/transition lines in couchdb.

---
 policy/modules/contrib/couchdb.te | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/policy/modules/contrib/couchdb.te b/policy/modules/contrib/couchdb.te
index 62f5db1..390c8cb 100644
--- a/policy/modules/contrib/couchdb.te
+++ b/policy/modules/contrib/couchdb.te
@@ -45,6 +45,10 @@ allow couchdb_t self:tcp_socket { accept listen };
 allow couchdb_t couchdb_conf_t:dir list_dir_perms;
 allow couchdb_t couchdb_conf_t:file read_file_perms;
 
+can_exec(couchdb_t, couchdb_exec_t)
+
+domtrans_pattern(couchdb_t, couchdb_js_exec_t, couchdb_js_t)
+
 manage_dirs_pattern(couchdb_t, couchdb_log_t, couchdb_log_t)
 append_files_pattern(couchdb_t, couchdb_log_t, couchdb_log_t)
 create_files_pattern(couchdb_t, couchdb_log_t, couchdb_log_t)
@@ -63,8 +67,6 @@ manage_dirs_pattern(couchdb_t, couchdb_var_run_t, couchdb_var_run_t)
 manage_files_pattern(couchdb_t, couchdb_var_run_t, couchdb_var_run_t)
 files_pid_filetrans(couchdb_t, couchdb_var_run_t, dir)
 
-can_exec(couchdb_t, couchdb_exec_t)
-
 kernel_read_system_state(couchdb_t)
 
 corecmd_exec_bin(couchdb_t)
@@ -98,8 +100,6 @@ auth_use_nsswitch(couchdb_t)
 
 miscfiles_read_localization(couchdb_t)
 
-domtrans_pattern(couchdb_t, couchdb_js_exec_t, couchdb_js_t)
-
 ########################################
 #
 # couchdb_js policy