diff --git a/functions/get_customer.pp b/functions/get_customer.pp index c1d9964..fc162fe 100644 --- a/functions/get_customer.pp +++ b/functions/get_customer.pp @@ -2,11 +2,7 @@ function sunetdrive::get_customer() >> String { $hostnameparts = split($facts['networking']['fqdn'],'\.') if $hostnameparts[1] == 'drive' { - if $hostnameparts[0] =~ /^gss/ { - return 'gss' - } else { - return 'common' - } + return 'common' } elsif $hostnameparts[0] =~ /idp-proxy/ { return 'common' } diff --git a/manifests/app_type.pp b/manifests/app_type.pp index e86aa86..e791207 100644 --- a/manifests/app_type.pp +++ b/manifests/app_type.pp @@ -66,14 +66,11 @@ define sunetdrive::app_type ( # These are encrypted values from local.eyaml - $gss_jwt_key = safe_hiera('gss_jwt_key') $smtppassword = safe_hiera('smtp_password') #These are global values from common.yaml $gs_enabled = hiera('gs_enabled') $gs_federation = hiera('gs_federation') - $gss_master_admin = hiera_array('gss_master_admin') - $gss_master_url = hiera("gss_master_url_${environment}") $mail_domain = hiera("mail_domain_${environment}") $mail_smtphost = hiera("mail_smtphost_${environment}") $mail_from_address = hiera("mail_from_address_${environment}") @@ -81,9 +78,6 @@ define sunetdrive::app_type ( $smtpuser = hiera("smtp_user_${environment}") $tug_office = hiera_array('tug_office') - # This is a global value from common.yaml but overridden in the gss-servers local.yaml - $gss_mode = hiera('gss_mode') - # These are global values from common.yaml but can be overridden in group.yaml $drive_email_template_text_left = $config['drive_email_template_text_left'] $drive_email_template_plain_text_left = $config['drive_email_template_plain_text_left'] @@ -114,9 +108,6 @@ define sunetdrive::app_type ( file { '/opt/nextcloud/user-sync.sh': ensure => absent, } - -> cron { 'gss_user_sync': - ensure => absent, - } file { '/usr/local/bin/nocc': ensure => present, force => true, @@ -322,23 +313,7 @@ define sunetdrive::app_type ( mode => '0744', } } - if $location =~ /^gss-test/ { - file { '/opt/nextcloud/mappingfile.json': - ensure => present, - owner => 'www-data', - group => 'root', - content => template('sunetdrive/application/mappingfile-test.json.erb'), - mode => '0644', - } - } elsif $location =~ /^gss/ { - file { '/opt/nextcloud/mappingfile.json': - ensure => present, - owner => 'www-data', - group => 'root', - content => template('sunetdrive/application/mappingfile-prod.json.erb'), - mode => '0644', - } - } elsif $location =~ /^kau/ { + if $location =~ /^kau/ { file { '/mnt': ensure => directory, owner => 'www-data', diff --git a/manifests/infra_script.pp b/manifests/infra_script.pp index 818cf1a..55376b6 100644 --- a/manifests/infra_script.pp +++ b/manifests/infra_script.pp @@ -6,7 +6,6 @@ class sunetdrive::infra_script ( $environment = sunetdrive::get_environment() $customer = 'common' $config = hiera_hash($environment) - $gss_backup_server = $config['gss_backup_server'] $ssh_config = "Host *.sunet.se User script IdentityFile /root/.ssh/id_script" @@ -58,7 +57,8 @@ class sunetdrive::infra_script ( mode => '0700', } sunet::scriptherder::cronjob { 'backupgssdb': - cmd => "/root/tasks/backupdb.sh ${gss_backup_server}", + ensure => 'absent', + cmd => 'true', hour => '2', minute => '0', ok_criteria => ['exit_status=0','max_age=2d'], diff --git a/manifests/multinode.pp b/manifests/multinode.pp index 1bf9aeb..385b1cd 100644 --- a/manifests/multinode.pp +++ b/manifests/multinode.pp @@ -14,8 +14,6 @@ class sunetdrive::multinode ( $db_ip = hiera_hash($environment)['db'] $admin_password = hiera('admin_password') $cluster_admin_password = hiera('cluster_admin_password') - # This is a global value from common.yaml but overridden in the gss-servers local.yaml - $gss_mode = hiera('gss_mode') $twofactor_enforced_groups = [] $twofactor_enforced_excluded_groups = [] @@ -271,8 +269,6 @@ MACAddressPolicy=none' $gs_enabled = hiera('gs_enabled') $gs_federation = hiera('gs_federation') - $gss_master_admin = hiera_array('gss_master_admin') - $gss_master_url = hiera("gss_master_url_${environment}") $https_port = hiera_hash('multinode_mapping')[$customer]['port'] $mail_domain = hiera("mail_domain_${environment}") $mail_from_address = hiera("mail_from_address_${environment}") @@ -326,7 +322,6 @@ MACAddressPolicy=none' $secret = safe_hiera("${customer}_secret") $passwordsalt= safe_hiera("${customer}_passwordsalt") $redis_host_password = safe_hiera("${customer}_redis_host_password") - $gss_jwt_key = safe_hiera('gss_jwt_key') $smtppassword = safe_hiera('smtp_password') $extra_config = { diff --git a/templates/application/docker-compose_nextcloud.yml.erb b/templates/application/docker-compose_nextcloud.yml.erb index 6ca5473..8722e40 100644 --- a/templates/application/docker-compose_nextcloud.yml.erb +++ b/templates/application/docker-compose_nextcloud.yml.erb @@ -24,9 +24,6 @@ services: <%- if @skeletondirectory -%> - /opt/nextcloud/skeleton:<%= @skeletondirectory %> <%- end -%> -<%- if @location =~ /^gss/ -%> - - /opt/nextcloud/mappingfile.json:/var/www/html/mappingfile.json -<%- end -%> <% if @location =~ /^kau/ -%> - /mnt:/opt/tmp/ <%- end -%> diff --git a/templates/monitor/sunetdrive_sites.cfg.erb b/templates/monitor/sunetdrive_sites.cfg.erb index c9a7772..ae293c4 100644 --- a/templates/monitor/sunetdrive_sites.cfg.erb +++ b/templates/monitor/sunetdrive_sites.cfg.erb @@ -138,7 +138,6 @@ define service { check_interval 5 check_period 24x7 <% cur_cust = site.gsub(/\.drive.*/,'') %> -<% cur_cust = cur_cust.gsub(/drive.*/,'gss') %> # 'check_nextcloud' command definition <% if @environment == 'prod' and not site.match('test') and @fullnodes.include?(cur_cust) %> contacts slack diff --git a/templates/script/maintenance.erb.sh b/templates/script/maintenance.erb.sh index f37cdc7..c57b690 100644 --- a/templates/script/maintenance.erb.sh +++ b/templates/script/maintenance.erb.sh @@ -17,7 +17,7 @@ if [[ "${ENVIRONMENT}" == "prod" ]]; then fi if [[ "${CUSTOMER}" == "common" ]]; then customer="" - types="multinode gss" + types="multinode" fi domain="${customer}drive.${env}sunet.se"