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

(PF-2137) Remove harmful terminology #87

Merged
merged 2 commits into from
May 3, 2021
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
8 changes: 4 additions & 4 deletions .github/workflows/ruby-rspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ruby_version: ['2.7.x', '2.6.x', '2.5.x', '2.4.x']
ruby: [2.7, 2.6, 2.5]

steps:
- uses: actions/checkout@v1
- name: Set up Ruby ${{ matrix.ruby_version }}
uses: actions/setup-ruby@v1
- name: Set up Ruby ${{ matrix.ruby }}
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby_version }}
ruby-version: ${{ matrix.ruby }}

- name: Build and test with Rspec
run: |
Expand Down
38 changes: 19 additions & 19 deletions spec/fixtures/v3/modules.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion spec/fixtures/v3/modules/puppetlabs-apache.json

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions spec/fixtures/v3/modules__owner=puppetlabs.json

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions spec/fixtures/v3/modules__query=apache.json

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions spec/fixtures/v3/releases.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions spec/fixtures/v3/releases/puppetlabs-apache-0.1.1.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@
"file_size": 13280,
"file_md5": "b00db93a5ee05c20207bbadcf85af2d6",
"downloads": 308,
"readme": "<section class=\"markdown\"><h1>Puppetlabs module for Apache</h1>\n\n<p>Apache is widely-used web server and this module will allow to configure\nvarious modules and setup virtual hosts with minimal effort.</p>\n\n<h2>Basic usage</h2>\n\n<p>To install Apache</p>\n\n<pre><code>class {&#39;apache&#39;: }\n</code></pre>\n\n<p>To install the Apache PHP module</p>\n\n<pre><code>class {&#39;apache::php&#39;: }\n</code></pre>\n\n<h2>Configure a virtual host</h2>\n\n<p>You can easily configure many parameters of a virtual host. A minimal\nexample is:</p>\n\n<pre><code>apache::vhost { &#39;www.example.com&#39;:\n priority =&gt; &#39;10&#39;,\n vhost_name =&gt; &#39;192.0.2.1&#39;,\n port =&gt; &#39;80&#39;,\n}\n</code></pre>\n\n<p>A slightly more complicated example, which moves the docroot and\nlogfile to an alternate location, might be:</p>\n\n<pre><code>apache::vhost { &#39;www.example.com&#39;:\n priority =&gt; &#39;10&#39;,\n vhost_name =&gt; &#39;192.0.2.1&#39;,\n port =&gt; &#39;80&#39;,\n docroot =&gt; &#39;/home/www.example.com/docroot/&#39;,\n logroot =&gt; &#39;/srv/www.example.com/logroot/&#39;,\n serveradmin =&gt; &#39;[email protected]&#39;,\n serveraliases =&gt; [&#39;example.com&#39;,],\n}\n</code></pre>\n\n<h2>Notes</h2>\n\n<p>Since Puppet cannot ensure that all parent directories exist you need to\nmanage these yourself. In the more advanced example above, you need to ensure \nthat <code>/home/www.example.com</code> and <code>/srv/www.example.com</code> directories exist.</p>\n\n<h2>Contributors</h2>\n\n<ul>\n<li>A cast of hundreds, hopefully you too soon</li>\n</ul>\n\n<h2>Copyright and License</h2>\n\n<p>Copyright (C) 2012 <a href=\"https://www.puppetlabs.com/\">Puppet Labs</a> Inc</p>\n\n<p>Puppet Labs can be contacted at: <a href=\"mailto:[email protected]\">[email protected]</a></p>\n\n<p>Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at</p>\n\n<p><a href=\"http://www.apache.org/licenses/LICENSE-2.0\">http://www.apache.org/licenses/LICENSE-2.0</a></p>\n\n<p>Unless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an &quot;AS IS&quot; BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.</p>\n</section>",
"readme": "<section class=\"markdown\"><h1>Puppetlabs module for Apache</h1>\n\n<p>Apache is widely-used web server and this module will allow to configure\nvarious modules and setup virtual hosts with minimal effort.</p>\n\n<h2>Basic usage</h2>\n\n<p>To install Apache</p>\n\n<pre><code>class {&#39;apache&#39;: }\n</code></pre>\n\n<p>To install the Apache PHP module</p>\n\n<pre><code>class {&#39;apache::php&#39;: }\n</code></pre>\n\n<h2>Configure a virtual host</h2>\n\n<p>You can easily configure many parameters of a virtual host. A minimal\nexample is:</p>\n\n<pre><code>apache::vhost { &#39;www.example.com&#39;:\n priority =&gt; &#39;10&#39;,\n vhost_name =&gt; &#39;192.0.2.1&#39;,\n port =&gt; &#39;80&#39;,\n}\n</code></pre>\n\n<p>A slightly more complicated example, which moves the docroot and\nlogfile to an alternate location, might be:</p>\n\n<pre><code>apache::vhost { &#39;www.example.com&#39;:\n priority =&gt; &#39;10&#39;,\n vhost_name =&gt; &#39;192.0.2.1&#39;,\n port =&gt; &#39;80&#39;,\n docroot =&gt; &#39;/home/www.example.com/docroot/&#39;,\n logroot =&gt; &#39;/srv/www.example.com/logroot/&#39;,\n serveradmin =&gt; &#39;[email protected]&#39;,\n serveraliases =&gt; [&#39;example.com&#39;,],\n}\n</code></pre>\n\n<h2>Notes</h2>\n\n<p>Since Puppet cannot ensure that all parent directories exist you need to\nmanage these yourself. In the more advanced example above, you need to ensure \nthat <code>/home/www.example.com</code> and <code>/srv/www.example.com</code> directories exist.</p>\n\n<h2>Contributors</h2>\n\n<ul>\n<li>A cast of hundreds, hopefully you too soon</li>\n</ul>\n\n<h2>Copyright and License</h2>\n\n<p>Copyright (C) 2012 <a href=\"https://www.puppetlabs.com/\">Puppet Labs</a> Inc</p>\n\n<p>Puppet Labs can be contacted at: <a href=\"mailto:[email protected]\">[email protected]</a></p>\n\n<p>Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at</p>\n\n<p><a href=\"http://www.apache.org/licenses/LICENSE-2.0\">http://www.apache.org/licenses/LICENSE-2.0</a></p>\n\n<p>Unless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an &quot;AS IS&quot; BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.</p>\n</section>",
"changelog": "<section class=\"plaintext\"><pre>2012-05-08 Puppet Labs &lt;[email protected]&gt; - 0.0.4\ne62e362 Fix broken tests for ssl, vhost, vhost::*\n42c6363 Changes to match style guide and pass puppet-lint without error\n42bc8ba changed name =&gt; path for file resources in order to name namevar by it&#x27;s name\n72e13de One end too much\n0739641 style guide fixes: &#x27;true&#x27; &lt;&gt; true, $operatingsystem needs to be $::operatingsystem, etc.\n273f94d fix tests\na35ede5 (#13860) Make a2enmod&#x2F;a2dismo commands optional\n98d774e (#13860) Autorequire Package[&#x27;httpd&#x27;]\n05fcec5 (#13073) Add missing puppet spec tests\n541afda (#6899) Remove virtual a2mod definition\n976cb69 (#13072) Move mod python and wsgi package names to params\n323915a (#13060) Add .gitignore to repo\nfdf40af (#13060) Remove pkg directory from source tree\nfd90015 Add LICENSE file and update the ModuleFile\nd3d0d23 Re-enable local php class\nd7516c7 Make management of firewalls configurable for vhosts\n60f83ba Explicitly lookup scope of apache_name in templates.\nf4d287f (#12581) Add explicit ordering for vdir directory\n88a2ac6 (#11706) puppetlabs-apache depends on puppetlabs-firewall\na776a8b (#11071) Fix to work with latest firewall module\n2b79e8b (#11070) Add support for Scientific Linux\n405b3e9 Fix for a2mod\n57b9048 Commit apache::vhost::redirect Manifest\n8862d01 Commit apache::vhost::proxy Manifest\nd5c1fd0 Commit apache::mod::wsgi Manifest\na825ac7 Commit apache::mod::python Manifest\nb77062f Commit Templates\n9a51b4a Vhost File Declarations\n6cf7312 Defaults for Parameters\n6a5b11a Ensure installed\nf672e46 a2mod fix\n8a56ee9 add pthon support to apache\n</pre></section>",
"license": "<section class=\"plaintext\"><pre>Copyright (C) 2012 Puppet Labs Inc\n\nPuppet Labs can be contacted at: [email protected]\n\nLicensed under the Apache License, Version 2.0 (the &quot;License&quot;);\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n http:&#x2F;&#x2F;www.apache.org&#x2F;licenses&#x2F;LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an &quot;AS IS&quot; BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n</pre></section>",
"created_at": "2012-08-08 00:23:44 -0700",
"updated_at": "2012-08-08 00:23:44 -0700",
"deleted_at": null
}
}
28 changes: 14 additions & 14 deletions spec/fixtures/v3/releases__module=puppetlabs-apache.json

Large diffs are not rendered by default.