mlibrary
diff --git a/‎manifests/profile/fulcrum/app.pp
Lines changed: 3 additions & 1 deletion b/‎manifests/profile/fulcrum/app.pp
Lines changed: 3 additions & 1 deletion
diff --git a/‎manifests/profile/fulcrum/fedora.pp
Lines changed: 29 additions & 16 deletions b/‎manifests/profile/fulcrum/fedora.pp
Lines changed: 29 additions & 16 deletions
diff --git a/‎manifests/profile/fulcrum/hosts.pp
Lines changed: 5 additions & 0 deletions b/‎manifests/profile/fulcrum/hosts.pp
Lines changed: 5 additions & 0 deletions
diff --git a/‎manifests/profile/fulcrum/mysql.pp
Lines changed: 36 additions & 18 deletions b/‎manifests/profile/fulcrum/mysql.pp
Lines changed: 36 additions & 18 deletions
diff --git a/‎manifests/profile/fulcrum/perl.pp
Lines changed: 35 additions & 0 deletions b/‎manifests/profile/fulcrum/perl.pp
Lines changed: 35 additions & 0 deletions
diff --git a/‎manifests/profile/fulcrum/shibboleth.pp
Lines changed: 4 additions & 4 deletions b/‎manifests/profile/fulcrum/shibboleth.pp
Lines changed: 4 additions & 4 deletions
diff --git a/‎manifests/profile/fulcrum/solr.pp
Lines changed: 68 additions & 5 deletions b/‎manifests/profile/fulcrum/solr.pp
Lines changed: 68 additions & 5 deletions
diff --git a/‎manifests/profile/openjdk_java.pp
Lines changed: 1 addition & 1 deletion b/‎manifests/profile/openjdk_java.pp
Lines changed: 1 addition & 1 deletion
diff --git a/‎manifests/profile/solr.pp
Lines changed: 1 addition & 1 deletion b/‎manifests/profile/solr.pp
Lines changed: 1 addition & 1 deletion
diff --git a/‎manifests/profile/www_lib/dependencies.pp
Lines changed: 6 additions & 1 deletion b/‎manifests/profile/www_lib/dependencies.pp
Lines changed: 6 additions & 1 deletion
diff --git a/‎manifests/role/fulcrum/standalone.pp
Lines changed: 8 additions & 3 deletions b/‎manifests/role/fulcrum/standalone.pp
Lines changed: 8 additions & 3 deletions
diff --git a/‎spec/classes/profile/fulcrum/solr_spec.rb
Lines changed: 18 additions & 0 deletions b/‎spec/classes/profile/fulcrum/solr_spec.rb
Lines changed: 18 additions & 0 deletions
@@ -9,7 +9,9 @@
   String $private_address_template = '192.168.0.%s',
   String $image_magick_secret = 'secret',
 ) {
-  $jdk_version = lookup('nebula::jdk_version')
+  # let's just try installing openjdk 11 headless
+  # openjdk 8 isn't available and there is no temurin headless
+  $jdk_version = '11'
 
   class { 'nebula::profile::networking::private':
     address_template => $private_address_template
 
@@ -8,46 +8,59 @@
   String $fedora_username = 'fedora',
   String $fedora_password = lookup('nebula::profile::fulcrum::mysql::fedora_password'),
 ) {
+  $jdk_version = lookup('nebula::jdk_version')
+  # used in erb file
+  $java_home = "/usr/lib/jvm/temurin-${jdk_version}-jre-amd64"
+
+  nebula::usergroup { 'fulcrum': }
+
   ensure_packages([
-    'tomcat8-user',
+    'tomcat9-user',
+    "temurin-${jdk_version}-jre",
   ])
 
   file { '/etc/sudoers.d/fedora':
     content => template('nebula/profile/fulcrum/sudoers-fedora.erb'),
   }
 
-  file {
-    ['/var/lib/fedora', '/var/log/fedora', '/opt/fedora', '/tmp/fedora']:
-      ensure => directory,
-      owner  => 'fulcrum',
-      group  => 'fulcrum',
-    ;
-  }
-
   exec { 'create fedora tomcat':
-    command => '/usr/bin/tomcat8-instance-create fedora',
+    command => '/usr/bin/tomcat9-instance-create fedora',
     cwd     => '/opt',
-    user    => 'fulcrum',
     creates => '/opt/fedora',
+    user    => 'fulcrum',
     require => [
-      User['fulcrum'],
-      Package['tomcat8-user'],
+      Package['tomcat9-user'],
     ],
   }
 
+  file {
+    ['/var/lib/fedora', '/var/log/fedora', '/opt/fedora', '/tmp/fedora']:
+      ensure  => directory,
+      owner   => 'fulcrum',
+      group   => 'fulcrum',
+      require => Exec['create fedora tomcat'],
+    ;
+  }
+
+  exec { 'chown -r /opt/fedora':
+    command => '/usr/bin/chown -R fulcrum:fulcrum /opt/fedora',
+    require => Exec['create fedora tomcat'],
+  }
+
   file { '/opt/fedora/logs':
     ensure  => 'symlink',
     owner   => 'fulcrum',
     group   => 'fulcrum',
+    force   => true,
     target  => '/var/log/fedora',
     require => Exec['create fedora tomcat'],
   }
 
   archive { '/opt/fedora/webapps/fedora.war':
     ensure        => present,
     extract       => false,
-    source        => 'https://github.com/fcrepo/fcrepo/releases/download/fcrepo-4.7.4/fcrepo-webapp-4.7.4.war',
-    checksum      => '11e06c843f40cf2b9f26bda94ddfe6d85d69a591',
+    source        => 'https://github.com/fcrepo/fcrepo/releases/download/fcrepo-4.7.6/fcrepo-webapp-4.7.6.war',
+    checksum      => '5882d8a4dc8b3817374503dff2043be79d9bbd72',
     checksum_type => 'sha1',
     cleanup       => false,
     user          => 'fulcrum',
@@ -81,7 +94,7 @@
       File['/etc/systemd/system/fedora.service'],
       File['/var/lib/fedora'],
       Archive['/opt/fedora/webapps/fedora.war'],
-      Mysql::Db['fedora'],
+      Service['mysqld'],
     ],
   }
 }
@@ -6,6 +6,7 @@
 class nebula::profile::fulcrum::hosts (
   $fedora = '127.0.0.1',
   $mysql = '127.0.0.1',
+  $keycard = '127.0.0.1',
   $redis = '127.0.0.1',
   $solr = '127.0.0.1',
 ) {
@@ -17,6 +18,10 @@
     ip => $mysql,
   }
 
+  host { 'keycard':
+    ip => $keycard,
+  }
+
   host { 'redis':
     ip => $redis,
   }
 
@@ -7,32 +7,50 @@
 class nebula::profile::fulcrum::mysql (
   String $fedora_password,
   String $fulcrum_password,
-  String $checkpoint_password,
   String $shibd_password,
+  String $root_password,
 ) {
-  include nebula::profile::mysql
+  # Install and configure mysql server
+  ensure_packages(['mariadb-common','mariadb-server', 'mariadb-client'])
 
-  mysql::db { 'fedora':
-    user     => 'fedora',
-    password => $fedora_password,
-    host     => 'localhost',
+# at some point need to do equivalent to `mysql_install_db --user=mysql --ldata=/var/lib/mysql`
+
+  service { 'mysqld':
+    ensure  => running,
+    enable  => true,
+    require => Package['mariadb-server'],
+  }
+
+  file { '/etc/mysql/conf.d':
+    ensure => 'directory'
   }
 
-  mysql::db { 'fulcrum':
-    user     => 'fulcrum',
-    password => $fulcrum_password,
-    host     => 'localhost',
+  file { '/etc/mysql/my.cnf':
+    owner   => 'mysql',
+    group   => 'mysql',
+    content => template('nebula/mysql/my.cnf.erb'),
+    notify  => Service['mysqld'],
+    require => Package['mariadb-server'],
   }
 
-  mysql::db { 'checkpoint':
-    user     => 'checkpoint',
-    password => $checkpoint_password,
-    host     => 'localhost',
+  exec { 'set-mysql-password':
+    unless  => "mysqladmin -uroot -p${root_password} status",
+    path    => ['/bin', '/usr/bin'],
+    command => "mysqladmin -uroot password ${root_password}",
+    require => Service['mysqld'],
   }
 
-  mysql::db { 'shibd':
-    user     => 'shibd',
-    password => $shibd_password,
-    host     => 'localhost',
+  $dbs = [['fedora', 'fedora', $fedora_password], ['fulcrum', 'fulcrum', $fulcrum_password],
+  ['checkpoint', 'fulcrum', $fulcrum_password], ['shibd', 'shibd', $shibd_password]]
+
+  $dbs.each |$db| {
+    $name = $db[0]
+    $user = $db[1]
+    $password = $db[2]
+    exec { "create-${name}-db":
+      unless  => "/usr/bin/mysql -u${user} -p${password} ${name}",
+      command => "/usr/bin/mysql -uroot -p${root_password} -e \"create database ${name}; grant all on ${name}.* to ${user}@localhost identified by '${password}';\"",
+      require => Service['mysqld'],
+    }
   }
 }
@@ -0,0 +1,35 @@
+# The perl profile is needed for monitor_pl to work, but it pulls in a
+# ton of stuff. We should probably allow for different haproxy http checks
+# for a service, and eliminate the perl/monitor_pl dependency here.
+
+class nebula::profile::fulcrum::perl (
+  Hash $hosts = {}
+) {
+  include nebula::profile::www_lib::perl
+
+  create_resources('host',$hosts)
+
+  include nebula::profile::www_lib::apache::base
+  include nebula::profile::www_lib::apache::fulcrum
+
+  cron {
+    default:
+      user => 'root',
+    ;
+
+    'purge apache access logs 1/2':
+      hour    => 1,
+      minute  => 7,
+      command => '/usr/bin/find /var/log/apache2 -type f -mtime +14 -name "*log*" -exec /bin/rm {} \; > /dev/null 2>&1',
+    ;
+
+    'purge apache access logs 2/2':
+      hour    => 1,
+      minute  => 17,
+      command => '/usr/bin/find /var/log/apache2 -type f -mtime +2  -name "*log*" ! -name "*log*gz" -exec /usr/bin/pigz {} \; > /dev/null 2>&1',
+      require => Package['pigz'],
+    ;
+  }
+
+  ensure_packages(['pigz'])
+}
@@ -7,9 +7,9 @@
 class nebula::profile::fulcrum::shibboleth {
   ensure_packages([
     'unixodbc',
-    'shibboleth-sp2-common',
-    'shibboleth-sp2-utils',
-    'mariadb-unixodbc',
+    'shibboleth-sp-common',
+    'shibboleth-sp-utils',
+    'odbc-mariadb',
   ])
 
   file { '/etc/odbcinst.ini':
@@ -52,7 +52,7 @@
     ensure     => 'running',
     enable     => true,
     hasrestart => true,
-    require    => [Package['shibboleth-sp2-utils'], Package['mariadb-unixodbc']]
+    require    => [Package['shibboleth-sp-utils'], Package['odbc-mariadb']]
   }
 
   service { 'shibauthorizer.socket':
 
@@ -4,11 +4,74 @@
 
 # nebula::profile::fulcrum::solr
 
-class nebula::profile::fulcrum::solr {
-  class { 'nebula::profile::solr':
-    base => '/var/lib/solr',
-    home => '/var/lib/solr/data',
-    logs => '/var/log/solr',
+class nebula::profile::fulcrum::solr (
+  String $base = '/var/lib/solr',
+  String $home = "${base}/home",
+  String $logs = "${base}/logs",
+  String $log4j_properties = "${base}/log4j.properties",
+  String $solr_in_sh = "${base}/solr.in.sh",
+  String $solr_xml = "${base}/solr.xml",
+  String $jdk_version = '8',
+  String $solr_home = '/var/lib/solr',
+  String $java_home = "/usr/lib/jvm/temurin-${jdk_version}-jre-${$facts['os']['architecture']}",
+  String $heap = '16G',
+  String $timezone = 'America/Detroit',
+  String $solr_bin = '/opt/solr/bin/solr',
+) {
+  ensure_packages([
+    "temurin-${jdk_version}-jre",
+    'solr',
+    'lsof',
+  ])
+
+  nebula::usergroup { 'solr': }
+
+  file {
+    default:
+      owner => 'solr',
+      group => 'fulcrum',
+    ;
+    [$base, $home, $logs]:
+      ensure => 'directory',
+      mode   => '0775',
+    ;
+    $log4j_properties:
+      ensure  => 'file',
+      mode    => '0644',
+      content => template('nebula/profile/fulcrum/solr/log4j.properties.erb'),
+    ;
+    $solr_in_sh:
+      ensure  => 'file',
+      mode    => '0644',
+      content => template('nebula/profile/fulcrum/solr/solr.in.sh.erb'),
+    ;
+    $solr_xml:
+      ensure  => 'file',
+      mode    => '0644',
+      content => template('nebula/profile/fulcrum/solr/solr.xml.erb'),
+    ;
+  }
+  file { '/etc/systemd/system/solr.service':
+    owner   => 'root',
+    group   => 'root',
+    content => template('nebula/profile/fulcrum/solr/solr.service.erb'),
+  }
+  service { 'solr':
+    ensure  => 'running',
+    enable  => true,
+    require => [Package['solr'], File['/etc/systemd/system/solr.service']],
+  }
+
+  class { 'nebula::profile::openjdk_java':
+    jdk_packages     => ["temurin-${jdk_version}-jre"],
+    default_jdk      => "temurin-${jdk_version}-jre",
+    base_alternative => $java_home,
+    java_alternative => "temurin-${jdk_version}-jre-amd64",
+  }
+
+  file { '/etc/environment':
+      content => inline_template("JAVA_HOME=${java_home}")
+      ;
   }
 
   file {
 
@@ -12,7 +12,7 @@
 ) {
   ensure_packages($jdk_packages)
   exec { 'ensure default java':
-    command => "/usr/sbin/update-java-alternatives -s ${java_alternative}",
+    command => "/usr/sbin/update-java-alternatives --jre -s ${java_alternative}",
     unless  => "/usr/bin/update-alternatives --query java | grep '^Value:.*${base_alternative}'",
     require => Package[$default_jdk]
   }
 
@@ -22,7 +22,7 @@
   ensure_packages(["openjdk-${jdk_version}-jre-headless",'solr','lsof'])
 
   # Note: Along with variables above these are used in erb files also.
-  $java_home = "/usr/lib/jvm/java-${jdk_version}-openjdk-amd64/jre"
+  $java_home = "/usr/lib/jvm/java-${jdk_version}-openjdk-amd64"
   $solr_bin = '/opt/solr/bin/solr'
 
   nebula::usergroup { 'solr': }
 
@@ -10,14 +10,19 @@
 #   include nebula::profile::www_lib::dependencies
 class nebula::profile::www_lib::dependencies {
   $jdk_version = lookup('nebula::jdk_version')
+  if $jdk_version == '8' {
+    $java_source = 'temurin'
+  } else {
+    $java_source = 'openjdk'
+  }
 
   ensure_packages (
     [
       'curl',
       'git',
       'emacs',
       'imagemagick',
-      "openjdk-${jdk_version}-jre",
+      "${java_source}-${jdk_version}-jre",
     ]
   )
 }
@@ -11,11 +11,16 @@
   include nebula::profile::ruby
   include nebula::profile::fulcrum::base
   include nebula::profile::fulcrum::hosts
+  include nebula::profile::fulcrum::mounts
+  include nebula::profile::fulcrum::symlinks
   include nebula::profile::fulcrum::app
-  include nebula::profile::fulcrum::fedora
   include nebula::profile::fulcrum::logrotate
-  include nebula::profile::fulcrum::mysql
   include nebula::profile::fulcrum::redis
-  include nebula::profile::fulcrum::shibboleth
+  include nebula::profile::fulcrum::perl
+
   include nebula::profile::fulcrum::solr
+  include nebula::profile::fulcrum::mysql
+
+  include nebula::profile::fulcrum::shibboleth
+  include nebula::profile::fulcrum::fedora
 }
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "nebula::profile::fulcrum::solr" do
+  on_supported_os.each do |os, os_facts|
+    context "on #{os}" do
+      let(:facts) { os_facts }
+      let(:hiera_config) { "spec/fixtures/hiera/fulcrum_config.yaml" }
+
+      it { is_expected.to compile }
+
+      it { is_expected.to contain_package("temurin-8-jre") }
+
+      it { is_expected.to contain_file("/etc/environment").with_content(%r{JAVA_HOME=/usr/lib/jvm/temurin-8-jre-amd64}) }
+    end
+  end
+end
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`) {`
`13`	`13`	`ensure_packages($jdk_packages)`
`14`	`14`	`exec { 'ensure default java':`
`15`		`- command => "/usr/sbin/update-java-alternatives -s ${java_alternative}",`
	`15`	`+ command => "/usr/sbin/update-java-alternatives --jre -s ${java_alternative}",`
`16`	`16`	`unless => "/usr/bin/update-alternatives --query java \| grep '^Value:.*${base_alternative}'",`
`17`	`17`	`require => Package[$default_jdk]`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,14 +10,19 @@`
`10`	`10`	`# include nebula::profile::www_lib::dependencies`
`11`	`11`	`class nebula::profile::www_lib::dependencies {`
`12`	`12`	`$jdk_version = lookup('nebula::jdk_version')`
	`13`	`+ if $jdk_version == '8' {`
	`14`	`+ $java_source = 'temurin'`
	`15`	`+ } else {`
	`16`	`+ $java_source = 'openjdk'`
	`17`	`+ }`
`13`	`18`
`14`	`19`	`ensure_packages (`
`15`	`20`	`[`
`16`	`21`	`'curl',`
`17`	`22`	`'git',`
`18`	`23`	`'emacs',`
`19`	`24`	`'imagemagick',`
`20`		`- "openjdk-${jdk_version}-jre",`
	`25`	`+ "${java_source}-${jdk_version}-jre",`
`21`	`26`	`]`
`22`	`27`	`)`
`23`	`28`	`}`