Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ability to indicate the group name when adding a user #310

Merged
merged 5 commits into from
Sep 26, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 70 additions & 61 deletions docs/index.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions docs/resources/file-directory/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -569,7 +569,7 @@ <h2 id="parameters">Parameters</h2>
</div>
<div class="stretch">
<div class="title">
user.user
param
</div>
</div>
</div>
Expand Down
131 changes: 70 additions & 61 deletions docs/resources/index.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions docs/resources/param/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
16 changes: 16 additions & 0 deletions docs/resources/user-group/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
Loading