Merge pull request #310 from asteris-llc/feature/user-user

Add ability to indicate the group name when adding a user
asteris-llc · Sep 26, 2016 · e0dec7e · e0dec7e
2 parents 46182b0 + b49ec32
commit e0dec7e
Show file tree

Hide file tree

Showing 14 changed files with 1,116 additions and 1,003 deletions.
diff --git a/docs/index.xml b/docs/index.xml
@@ -6,9 +6,78 @@
     <description>Recent content on Converge</description>
     <generator>Hugo -- gohugo.io</generator>
     <language>en-us</language>
-    <lastBuildDate>Wed, 21 Sep 2016 14:04:24 -0500</lastBuildDate>
+    <lastBuildDate>Mon, 26 Sep 2016 09:00:07 -0500</lastBuildDate>
     <atom:link href="http://converge.aster.is/index.xml" rel="self" type="application/rss+xml" />
 
+    <item>
+      <title>user.user</title>
+      <link>http://converge.aster.is/resources/user-user/</link>
+      <pubDate>Mon, 26 Sep 2016 09:00:07 -0500</pubDate>
+
+      <guid>http://converge.aster.is/resources/user-user/</guid>
+      <description>
+
+&lt;p&gt;User renders user data&lt;/p&gt;
+
+&lt;h2 id=&#34;example&#34;&gt;Example&lt;/h2&gt;
+
+&lt;pre&gt;&lt;code class=&#34;language-hcl&#34;&gt;# create a user, only works on linux
+user.user &amp;quot;user&amp;quot; {
+  username = &amp;quot;test&amp;quot;
+}
+
+&lt;/code&gt;&lt;/pre&gt;
+
+&lt;h2 id=&#34;parameters&#34;&gt;Parameters&lt;/h2&gt;
+
+&lt;ul&gt;
+&lt;li&gt;&lt;code&gt;username&lt;/code&gt; (string)&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;p&gt;Username is the user login name.&lt;/p&gt;
+
+&lt;ul&gt;
+&lt;li&gt;&lt;code&gt;uid&lt;/code&gt; (string)&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;p&gt;UID is the user ID.&lt;/p&gt;
+
+&lt;ul&gt;
+&lt;li&gt;&lt;code&gt;groupname&lt;/code&gt; (string)&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;p&gt;Groupname is the primary group for user and must already exist.
+Only one of GID or Groupname may be indicated.&lt;/p&gt;
+
+&lt;ul&gt;
+&lt;li&gt;&lt;code&gt;gid&lt;/code&gt; (string)&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;p&gt;Gid is the primary group ID for user and must refer to an existing group.
+Only one of GID or Groupname may be indicated.&lt;/p&gt;
+
+&lt;ul&gt;
+&lt;li&gt;&lt;code&gt;name&lt;/code&gt; (string)&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;p&gt;Name is the user description.&lt;/p&gt;
+
+&lt;ul&gt;
+&lt;li&gt;&lt;code&gt;home_dir&lt;/code&gt; (string)&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;p&gt;HomeDir is the user&amp;rsquo;s login directory. By default,  the login
+name is appended to the home directory.&lt;/p&gt;
+
+&lt;ul&gt;
+&lt;li&gt;&lt;code&gt;state&lt;/code&gt; (string)&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;p&gt;State is whether the user should be present.
+Options are present and absent; default is present.&lt;/p&gt;
+</description>
+    </item>
+
     <item>
       <title>user.group</title>
       <link>http://converge.aster.is/resources/user-group/</link>
@@ -455,66 +524,6 @@ treated as required.&lt;/p&gt;
 </description>
     </item>
 
-    <item>
-      <title>user.user</title>
-      <link>http://converge.aster.is/resources/user-user/</link>
-      <pubDate>Fri, 16 Sep 2016 15:26:27 -0500</pubDate>
-
-      <guid>http://converge.aster.is/resources/user-user/</guid>
-      <description>
-
-&lt;p&gt;User renders user data&lt;/p&gt;
-
-&lt;h2 id=&#34;example&#34;&gt;Example&lt;/h2&gt;
-
-&lt;pre&gt;&lt;code class=&#34;language-hcl&#34;&gt;# create a user, only works on linux
-user.user &amp;quot;user&amp;quot; {
-  username = &amp;quot;test&amp;quot;
-}
-
-&lt;/code&gt;&lt;/pre&gt;
-
-&lt;h2 id=&#34;parameters&#34;&gt;Parameters&lt;/h2&gt;
-
-&lt;ul&gt;
-&lt;li&gt;&lt;code&gt;uid&lt;/code&gt; (string)&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;p&gt;UID is the user ID.&lt;/p&gt;
-
-&lt;ul&gt;
-&lt;li&gt;&lt;code&gt;gid&lt;/code&gt; (string)&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;p&gt;Gid is the primary group ID for user.&lt;/p&gt;
-
-&lt;ul&gt;
-&lt;li&gt;&lt;code&gt;username&lt;/code&gt; (string)&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;p&gt;Username is the user login name.&lt;/p&gt;
-
-&lt;ul&gt;
-&lt;li&gt;&lt;code&gt;name&lt;/code&gt; (string)&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;p&gt;Name is the user description.&lt;/p&gt;
-
-&lt;ul&gt;
-&lt;li&gt;&lt;code&gt;home_dir&lt;/code&gt; (string)&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;p&gt;HomeDir is the user&amp;rsquo;s login directory. By default,  the login
-name is appended to the home directory.&lt;/p&gt;
-
-&lt;ul&gt;
-&lt;li&gt;&lt;code&gt;state&lt;/code&gt; (string)&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;p&gt;State is whether the user should be present.&lt;/p&gt;
-</description>
-    </item>
-
     <item>
       <title>file.directory</title>
       <link>http://converge.aster.is/resources/file-directory/</link>

diff --git a/docs/resources/file-directory/index.html b/docs/resources/file-directory/index.html
@@ -559,7 +559,7 @@ <h2 id="parameters">Parameters</h2>
 <nav class="pagination" aria-label="Footer">
   <div class="previous">
 
-      <a href="http://converge.aster.is/resources/user-user/" title="user.user">
+      <a href="http://converge.aster.is/resources/param/" title="param">
         <span class="direction">
           Previous
         </span>
@@ -569,7 +569,7 @@ <h2 id="parameters">Parameters</h2>
           </div>
           <div class="stretch">
             <div class="title">
-              user.user
+              param
             </div>
           </div>
         </div>

diff --git a/docs/resources/index.xml b/docs/resources/index.xml
@@ -6,9 +6,78 @@
     <description>Recent content in Resources on Converge</description>
     <generator>Hugo -- gohugo.io</generator>
     <language>en-us</language>
-    <lastBuildDate>Wed, 21 Sep 2016 14:04:24 -0500</lastBuildDate>
+    <lastBuildDate>Mon, 26 Sep 2016 09:00:07 -0500</lastBuildDate>
     <atom:link href="http://converge.aster.is/resources/index.xml" rel="self" type="application/rss+xml" />
 
+    <item>
+      <title>user.user</title>
+      <link>http://converge.aster.is/resources/user-user/</link>
+      <pubDate>Mon, 26 Sep 2016 09:00:07 -0500</pubDate>
+
+      <guid>http://converge.aster.is/resources/user-user/</guid>
+      <description>
+
+&lt;p&gt;User renders user data&lt;/p&gt;
+
+&lt;h2 id=&#34;example&#34;&gt;Example&lt;/h2&gt;
+
+&lt;pre&gt;&lt;code class=&#34;language-hcl&#34;&gt;# create a user, only works on linux
+user.user &amp;quot;user&amp;quot; {
+  username = &amp;quot;test&amp;quot;
+}
+
+&lt;/code&gt;&lt;/pre&gt;
+
+&lt;h2 id=&#34;parameters&#34;&gt;Parameters&lt;/h2&gt;
+
+&lt;ul&gt;
+&lt;li&gt;&lt;code&gt;username&lt;/code&gt; (string)&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;p&gt;Username is the user login name.&lt;/p&gt;
+
+&lt;ul&gt;
+&lt;li&gt;&lt;code&gt;uid&lt;/code&gt; (string)&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;p&gt;UID is the user ID.&lt;/p&gt;
+
+&lt;ul&gt;
+&lt;li&gt;&lt;code&gt;groupname&lt;/code&gt; (string)&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;p&gt;Groupname is the primary group for user and must already exist.
+Only one of GID or Groupname may be indicated.&lt;/p&gt;
+
+&lt;ul&gt;
+&lt;li&gt;&lt;code&gt;gid&lt;/code&gt; (string)&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;p&gt;Gid is the primary group ID for user and must refer to an existing group.
+Only one of GID or Groupname may be indicated.&lt;/p&gt;
+
+&lt;ul&gt;
+&lt;li&gt;&lt;code&gt;name&lt;/code&gt; (string)&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;p&gt;Name is the user description.&lt;/p&gt;
+
+&lt;ul&gt;
+&lt;li&gt;&lt;code&gt;home_dir&lt;/code&gt; (string)&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;p&gt;HomeDir is the user&amp;rsquo;s login directory. By default,  the login
+name is appended to the home directory.&lt;/p&gt;
+
+&lt;ul&gt;
+&lt;li&gt;&lt;code&gt;state&lt;/code&gt; (string)&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;p&gt;State is whether the user should be present.
+Options are present and absent; default is present.&lt;/p&gt;
+</description>
+    </item>
+
     <item>
       <title>user.group</title>
       <link>http://converge.aster.is/resources/user-group/</link>
@@ -313,66 +382,6 @@ treated as required.&lt;/p&gt;
 </description>
     </item>
 
-    <item>
-      <title>user.user</title>
-      <link>http://converge.aster.is/resources/user-user/</link>
-      <pubDate>Fri, 16 Sep 2016 15:26:27 -0500</pubDate>
-
-      <guid>http://converge.aster.is/resources/user-user/</guid>
-      <description>
-
-&lt;p&gt;User renders user data&lt;/p&gt;
-
-&lt;h2 id=&#34;example&#34;&gt;Example&lt;/h2&gt;
-
-&lt;pre&gt;&lt;code class=&#34;language-hcl&#34;&gt;# create a user, only works on linux
-user.user &amp;quot;user&amp;quot; {
-  username = &amp;quot;test&amp;quot;
-}
-
-&lt;/code&gt;&lt;/pre&gt;
-
-&lt;h2 id=&#34;parameters&#34;&gt;Parameters&lt;/h2&gt;
-
-&lt;ul&gt;
-&lt;li&gt;&lt;code&gt;uid&lt;/code&gt; (string)&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;p&gt;UID is the user ID.&lt;/p&gt;
-
-&lt;ul&gt;
-&lt;li&gt;&lt;code&gt;gid&lt;/code&gt; (string)&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;p&gt;Gid is the primary group ID for user.&lt;/p&gt;
-
-&lt;ul&gt;
-&lt;li&gt;&lt;code&gt;username&lt;/code&gt; (string)&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;p&gt;Username is the user login name.&lt;/p&gt;
-
-&lt;ul&gt;
-&lt;li&gt;&lt;code&gt;name&lt;/code&gt; (string)&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;p&gt;Name is the user description.&lt;/p&gt;
-
-&lt;ul&gt;
-&lt;li&gt;&lt;code&gt;home_dir&lt;/code&gt; (string)&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;p&gt;HomeDir is the user&amp;rsquo;s login directory. By default,  the login
-name is appended to the home directory.&lt;/p&gt;
-
-&lt;ul&gt;
-&lt;li&gt;&lt;code&gt;state&lt;/code&gt; (string)&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;p&gt;State is whether the user should be present.&lt;/p&gt;
-</description>
-    </item>
-
     <item>
       <title>file.directory</title>
       <link>http://converge.aster.is/resources/file-directory/</link>

diff --git a/docs/resources/param/index.html b/docs/resources/param/index.html
@@ -579,14 +579,14 @@ <h2 id="parameters">Parameters</h2>
 
   <div class="next">
 
-      <a href="http://converge.aster.is/resources/user-user/" title="user.user">
+      <a href="http://converge.aster.is/resources/file-directory/" title="file.directory">
         <span class="direction">
           Next
         </span>
         <div class="page">
           <div class="stretch">
             <div class="title">
-              user.user
+              file.directory
             </div>
           </div>
           <div class="button button-next" role="button" aria-label="Next">

diff --git a/docs/resources/user-group/index.html b/docs/resources/user-group/index.html
@@ -560,6 +560,22 @@ <h2 id="parameters">Parameters</h2>
 <nav class="pagination" aria-label="Footer">
   <div class="previous">
 
+      <a href="http://converge.aster.is/resources/user-user/" title="user.user">
+        <span class="direction">
+          Previous
+        </span>
+        <div class="page">
+          <div class="button button-previous" role="button" aria-label="Previous">
+            <i class="icon icon-back"></i>
+          </div>
+          <div class="stretch">
+            <div class="title">
+              user.user
+            </div>
+          </div>
+        </div>
+      </a>
+
   </div>
 
   <div class="next">