From 6ff6c7af2a1ef2dfb2497d7b5df8c5904ae8ac3e Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <alexander.olofsson@liu.se>
Date: Mon, 1 Jul 2019 15:53:16 +0200
Subject: [PATCH] Clean up module after migration and rename
---
Jenkinsfile | 9 -----
README.md | 84 ++-----------------------------------------
manifests/firewall.pp | 2 +-
manifests/init.pp | 6 ++--
metadata.json | 12 +++----
5 files changed, 12 insertions(+), 101 deletions(-)
delete mode 100644 Jenkinsfile
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 5a43c3b..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,9 +0,0 @@
-// The main pipeline for the project
-// Information about the possibilities can be found at
-// https://gitlab.it.liu.se/jenkins/Workflow-Libs
-puppetModule {
- name = 'skadereg'
-
- // Provide puppet-lint's suggested changes as a patch
- providePatch = true
-}
diff --git a/README.md b/README.md
index cdaddfb..03dab75 100644
--- a/README.md
+++ b/README.md
@@ -1,84 +1,4 @@
-skadereg
+AIM Control
====
-#### Table of Contents
-
-1. [Description](#description)
-1. [Setup - The basics of getting started with skadereg](#setup)
- * [What skadereg affects](#what-skadereg-affects)
- * [Setup requirements](#setup-requirements)
- * [Beginning with skadereg](#beginning-with-skadereg)
-1. [Usage - Configuration options and additional functionality](#usage)
-1. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
-1. [Limitations - OS compatibility, etc.](#limitations)
-1. [Development - Guide for contributing to the module](#development)
-
-## Description
-
-Start with a one- or two-sentence summary of what the module does and/or what
-problem it solves. This is your 30-second elevator pitch for your module.
-Consider including OS/Puppet version it works with.
-
-You can give more descriptive information in a second paragraph. This paragraph
-should answer the questions: "What does this module *do*?" and "Why would I use
-it?" If your module has a range of functionality (installation, configuration,
-management, etc.), this is the time to mention it.
-
-## Setup
-
-### What skadereg affects **OPTIONAL**
-
-If it's obvious what your module touches, you can skip this section. For
-example, folks can probably figure out that your mysql_instance module affects
-their MySQL instances.
-
-If there's more that they should know about, though, this is the place to mention:
-
-* A list of files, packages, services, or operations that the module will alter,
- impact, or execute.
-* Dependencies that your module automatically installs.
-* Warnings or other important notices.
-
-### Setup Requirements **OPTIONAL**
-
-If your module requires anything extra before setting up (pluginsync enabled,
-etc.), mention it here.
-
-If your most recent release breaks compatibility or requires particular steps
-for upgrading, you might want to include an additional "Upgrading" section
-here.
-
-### Beginning with skadereg
-
-The very basic steps needed for a user to get the module up and running. This
-can include setup steps, if necessary, or it can be an example of the most
-basic use of the module.
-
-## Usage
-
-This section is where you describe how to customize, configure, and do the
-fancy stuff with your module here. It's especially helpful if you include usage
-examples and code samples for doing things with your module.
-
-## Reference
-
-Here, include a complete list of your module's classes, types, providers,
-facts, along with the parameters for each. Users refer to this section (thus
-the name "Reference") to find specific details; most users don't read it per
-se.
-
-## Limitations
-
-This is where you list OS compatibility, version compatibility, etc. If there
-are Known Issues, you might want to include them under their own heading here.
-
-## Development
-
-Since your module is awesome, other users will want to play with it. Let them
-know what the ground rules for contributing are.
-
-## Release Notes/Contributors/Etc. **Optional**
-
-If you aren't using changelog, put your release notes here (though you should
-consider using changelog). You can also add any additional sections you feel
-are necessary or important to include here. Please use the `## ` header.
+TODO: Fill this in
\ No newline at end of file
diff --git a/manifests/firewall.pp b/manifests/firewall.pp
index 0918c88..60b1bae 100644
--- a/manifests/firewall.pp
+++ b/manifests/firewall.pp
@@ -1,4 +1,4 @@
-class skadereg::firewall{
+class aim_control::firewall{
::server_firewall::constricto_chain{ 'skadereg': }
::server_firewall::rules_file { '55-permit-skadereg.rules':
content => template("${module_name}/55-permit-skadereg.rules.erb"),
diff --git a/manifests/init.pp b/manifests/init.pp
index b9489bd..7d4522a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,4 +1,4 @@
-# Class: skadereg
+# Class: aim_control
# ===========================
#
# Parameters
@@ -27,7 +27,7 @@
#
# Copyright © Linköpings Universitet
#
-class skadereg(
+class aim_control(
String $mysql_password,
String $mysql_backup_password,
String $skadereg_ro_password,
@@ -58,7 +58,7 @@ class skadereg(
],
}
- include ::skadereg::firewall
+ include ::aim_control::firewall
include ::yum::centos_scl
include ::apache
diff --git a/metadata.json b/metadata.json
index 05a2729..7490733 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,12 +1,12 @@
{
- "name": "liuit-skadereg",
+ "name": "liu-aim_control",
"version": "0.0.0",
- "author": "LiU-IT",
- "summary": "Puppet module for skadereg",
+ "author": "LiU",
+ "summary": "Puppet module for AIM Control",
"license": "TBD",
- "source": "https://gitlab.it.liu.se/pm-liuit/skadereg/tree/production",
- "project_page": "https://gitlab.it.liu.se/pm-liuit/skadereg",
- "issues_url": "https://gitlab.it.liu.se/pm-liuit/skadereg/issues",
+ "source": "https://gitlab.liu.se/-/ide/project/liu-puppet-modules/aim_control/tree/production",
+ "project_page": "https://gitlab.liu.se/-/ide/project/liu-puppet-modules/aim_control",
+ "issues_url": "https://gitlab.liu.se/-/ide/project/liu-puppet-modules/aim_control/issues",
"dependencies": [
{ "name": "puppetlabs-stdlib", "version_requirement": ">= 1.0.0" }
],
--
GitLab