diff --git a/manifests/site.pp b/manifests/site.pp index 5679f281e86c43ae93f1484fb78ebe7a3734ee21..ae3fc72ce57181eb4458b3445db1d57192ce48e1 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 af56e793ccb2c91b56d51f302c6f3d96ac02a5ab..0000000000000000000000000000000000000000 --- 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 5e156ecf63ce6db60d421fce9f6bacc974ab92dd..fc55a03f339430460bb95741bb5c8e0a0fe5001b 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 edd10fe81777b272a9ec951e9c64fa3bfc9eaabf..06ddbf201c595f82cd0630798ee7c0df6de344e7 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 0000000000000000000000000000000000000000..b9067c40bfd498c190ff9616e0b11f109f262c89 --- /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 0b5469b831abbefd8c9c55bb533a8786c3e8a6bc..9c84bdd261a1c2e21203de6de64a3e80164f9370 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' } }