Skip to content

Commit

Permalink
public release of 3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
markov2 committed Jan 18, 2019
0 parents commit 49834cc
Show file tree
Hide file tree
Showing 1,671 changed files with 629,518 additions and 0 deletions.
13 changes: 13 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Don't export Git stuff.
.gitattributes export-ignore
.gitignore export-ignore

# Don't export developer stuff.
Vagrantfile export-ignore
.vagrant/puppet export-ignore
devel export-ignore

# Don't export documentation source files. Docs should be distributed as PDF, not doc.
# (The docs/ directory is scrubbed by our packaging script anyway, but better safe than sorry.)
*.doc export-ignore
*.docx export-ignore
25 changes: 25 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# A place for developers to put files that are local to their installation and shouldn't be in the repo, such as
# temporary test scripts or notes.
local/

# Vim swapfiles.
*.swp
*.swo

# Local Vagrant state.
.vagrant/machines/

# In contrast to the other config files, taranis.conf.xml isn't versioned but shipped as taranis.conf.xml-dist.
conf/taranis.conf.xml

# User should manually put libraries/binaries here.
phantomjs/bin/
ChartDirector/
local_libraries

# Pidfiles, logs, etc.
*.pid
collector/log/
collector/cookie_jar.txt
tmp/
webinterface/stats/tmp/
5 changes: 5 additions & 0 deletions .vagrant/puppet/manifests/install_scripts_centos.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class { 'taranis_install_scripts':
os => 'centos'
}

include taranis_install_scripts
5 changes: 5 additions & 0 deletions .vagrant/puppet/manifests/install_scripts_ubuntu.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class { 'taranis_install_scripts':
os => 'ubuntu'
}

include taranis_install_scripts
66 changes: 66 additions & 0 deletions .vagrant/puppet/modules/taranis_install_scripts/manifests/init.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# taranis_install_scripts: unpack Taranis and run installation scripts.

class taranis_install_scripts ($os) {
group { 'taranis':
ensure => present,
}
user { 'taranis':
ensure => present,
gid => 'taranis',
home => '/opt/taranis',
shell => '/bin/bash',
}


package { 'git':
ensure => present,
}

# Create a clean install (from working directory's HEAD commit) using the
# packaging script.
exec { 'create package':
command => '/vagrant/devel/package-public-excluding-docs.pl HEAD > /opt/taranis-HEAD.tgz',
creates => '/opt/taranis-HEAD.tgz',
}
exec { 'untar package':
cwd => '/opt',
command => '/bin/tar zxf /opt/taranis-HEAD.tgz',
creates => '/opt/taranis-HEAD',
}

file { '/opt/taranis':
ensure => link,
target => '/opt/taranis-HEAD',
}

if $os == 'centos' {
exec { 'epel_install':
command => "/opt/taranis/install_scripts/${os}/epel_install.sh",
require => File['/opt/taranis'],
before => Exec['os_packages'],
}
}

exec { 'os_packages':
command => $os ? {
'ubuntu' => "/opt/taranis/install_scripts/ubuntu/debian_packages.sh",
'centos' => "/opt/taranis/install_scripts/centos/rpm_packages.sh",
},
timeout => 0,
}

exec { 'cpan_modules':
command => "/opt/taranis/install_scripts/${os}/cpan_modules.sh",
timeout => 0,
}

exec { 'permissions':
command => "/opt/taranis/install_scripts/${os}/taranis_permissions.sh",
}

Package['git']
-> Exec['create package'] -> Exec['untar package'] -> File['/opt/taranis']
-> Exec['os_packages'] -> Exec['cpan_modules'] -> Exec['permissions']

Group['taranis'] -> User['taranis'] -> Exec['permissions']
}
47 changes: 47 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
= release 3.5.0-rc4

Fixes:
- Minor bug fixes

= release 3.5.0

Fixes:
- #260 race condition while collecting in parallel.

= release 3.5.0-rc3

Fixes:
- work-around to make sort buttons work.
- running phantomjs to take pictures.
- install do not unpack sources again.

= release 3.5.0-rc2

Fixes:
- path for taranis command, to prefer local templates
- matching keywords in IMAP/POP sources
- parsing email attachments in display assess
- #255 emailing assess item fails

= release 3.5.0

Please see the website for upgrade instructions.

Bugfixes are discussed in the issues in GitHUB. This file only lists
substantial changes. The public wiki provides more details on the
changes and fixes.

Changes:
- Upgrade license from EUPL 1.1 to EUPL 1.2
- Change the way that copyright and license is included in the code.
- Remove personal names from the code.
- Rename 'taranis specint send-reminders' to 'taranis send specint-reminders'

Improvements:
- add 'taranis send year-stats'
- add 'taranis db remove-items'
- add 'taranis db schema-version'
- add 'taranis install --remove'
- add reply-to header to publications
- add assess page short-cut '!'
- advisory print preview contains advisory matrix
Loading

0 comments on commit 49834cc

Please sign in to comment.