From 71d1ebcb67f72109d6ebdcc33eca6f31137fa6ec Mon Sep 17 00:00:00 2001 From: Henrik Henriksson <hx@hx.ax> Date: Tue, 22 Jan 2019 21:30:22 +0100 Subject: [PATCH] Rename module 'holger' to 'insidan' --- manifests/site.pp | 2 +- modules/holger/manifests/init.pp | 4 ---- .../files/byggerom/header_2018.png | Bin .../{holger => insidan}/files/byggerom/index.html | 0 .../{holger => insidan}/files/byggerom/kontakt.html | 0 modules/{holger => insidan}/files/holgerlogga.png | Bin modules/{holger => insidan}/manifests/byggerom.pp | 4 ++-- .../{holger => insidan}/manifests/certificates.pp | 2 +- modules/insidan/manifests/init.pp | 4 ++++ .../{holger => insidan}/manifests/openproject.pp | 4 ++-- 10 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 modules/holger/manifests/init.pp rename modules/{holger => insidan}/files/byggerom/header_2018.png (100%) rename modules/{holger => insidan}/files/byggerom/index.html (100%) rename modules/{holger => insidan}/files/byggerom/kontakt.html (100%) rename modules/{holger => insidan}/files/holgerlogga.png (100%) rename modules/{holger => insidan}/manifests/byggerom.pp (93%) rename modules/{holger => insidan}/manifests/certificates.pp (93%) create mode 100644 modules/insidan/manifests/init.pp rename modules/{holger => insidan}/manifests/openproject.pp (95%) diff --git a/manifests/site.pp b/manifests/site.pp index 5679f28..ae3fc72 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1,7 +1,7 @@ node 'holgerspexet' { require ::baseinstall require ::puppetfetch - include ::holger + include ::insidan } node 'holgerspexet-public' { diff --git a/modules/holger/manifests/init.pp b/modules/holger/manifests/init.pp deleted file mode 100644 index af56e79..0000000 --- a/modules/holger/manifests/init.pp +++ /dev/null @@ -1,4 +0,0 @@ -class holger { - include ::holger::openproject - include ::holger::byggerom -} diff --git a/modules/holger/files/byggerom/header_2018.png b/modules/insidan/files/byggerom/header_2018.png similarity index 100% rename from modules/holger/files/byggerom/header_2018.png rename to modules/insidan/files/byggerom/header_2018.png diff --git a/modules/holger/files/byggerom/index.html b/modules/insidan/files/byggerom/index.html similarity index 100% rename from modules/holger/files/byggerom/index.html rename to modules/insidan/files/byggerom/index.html diff --git a/modules/holger/files/byggerom/kontakt.html b/modules/insidan/files/byggerom/kontakt.html similarity index 100% rename from modules/holger/files/byggerom/kontakt.html rename to modules/insidan/files/byggerom/kontakt.html diff --git a/modules/holger/files/holgerlogga.png b/modules/insidan/files/holgerlogga.png similarity index 100% rename from modules/holger/files/holgerlogga.png rename to modules/insidan/files/holgerlogga.png diff --git a/modules/holger/manifests/byggerom.pp b/modules/insidan/manifests/byggerom.pp similarity index 93% rename from modules/holger/manifests/byggerom.pp rename to modules/insidan/manifests/byggerom.pp index 5e156ec..fc55a03 100644 --- a/modules/holger/manifests/byggerom.pp +++ b/modules/insidan/manifests/byggerom.pp @@ -1,4 +1,4 @@ -class holger::byggerom { +class insidan::byggerom { include nginx # Setup Nginx nginx::resource::server { 'holgerspexet.se': @@ -26,6 +26,6 @@ class holger::byggerom { ensure => directory, recurse => true, mode => '0744', - source => 'puppet:///modules/holger/byggerom/', + source => 'puppet:///modules/insidan/byggerom/', } } diff --git a/modules/holger/manifests/certificates.pp b/modules/insidan/manifests/certificates.pp similarity index 93% rename from modules/holger/manifests/certificates.pp rename to modules/insidan/manifests/certificates.pp index edd10fe..06ddbf2 100644 --- a/modules/holger/manifests/certificates.pp +++ b/modules/insidan/manifests/certificates.pp @@ -1,4 +1,4 @@ -class holger::certificates { +class insidan::certificates { class { '::letsencrypt': email => 'hx@hx.ax', # Putting in my personal email for now } diff --git a/modules/insidan/manifests/init.pp b/modules/insidan/manifests/init.pp new file mode 100644 index 0000000..b9067c4 --- /dev/null +++ b/modules/insidan/manifests/init.pp @@ -0,0 +1,4 @@ +class insidan { + include ::insidan::openproject + include ::insidan::byggerom +} diff --git a/modules/holger/manifests/openproject.pp b/modules/insidan/manifests/openproject.pp similarity index 95% rename from modules/holger/manifests/openproject.pp rename to modules/insidan/manifests/openproject.pp index 0b5469b..9c84bdd 100644 --- a/modules/holger/manifests/openproject.pp +++ b/modules/insidan/manifests/openproject.pp @@ -1,4 +1,4 @@ -class holger::openproject { +class insidan::openproject { include nginx include holger::certificates # This is horrible. Please fix. @@ -41,7 +41,7 @@ class holger::openproject { file { '/opt/openproject/public/assets/logo_openproject_white_big-2c6d79fa03613154cf6bd67c622dbae5b93ed3199e0e7332d96b6f8ec21f85a1.png': ensure => file, - source => 'puppet:///modules/holger/holgerlogga.png' + source => 'puppet:///modules/insidan/holgerlogga.png' } } -- GitLab