Skip to content

Fixing syntax issue with missing double quote #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hundredacres wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixing syntax issue with missing double quote #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b86395
Fixing syntax issue with missing double quote
Oct 31, 2014
e8291f0
Updating repo url to use releasever param
Jan 6, 2015
ed5700f
Puppet-lint fixes
Jan 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/facter/zabbix_proxy_ver.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
distid = Facter.value('lsbdistid')
case distid
when /RedHatEnterprise|CentOS|Fedora/
Facter::Util::Resolution.exec('/bin/rpm -q --qf "%{VERSION} zabbix-proxy')
Facter::Util::Resolution.exec('/bin/rpm -q --qf "%{VERSION}" zabbix-proxy')
when "ubuntu"
Facter::Util::Resolution.exec('/bin/dpkg-query -W -f \'${version}\n\' zabbix-proxy-sqlite3 | cut -d":" -f2')
"debian"
Expand Down
4 changes: 2 additions & 2 deletions manifests/repo.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@
/(RedHat|CentOS|Fedora|SLC)/: {
yumrepo{ 'zabbix':
descr => "Zabbix Official Repository - ${::architecture}",
baseurl => 'http://repo.zabbix.com/zabbix/2.2/rhel/6/$basearch/',
baseurl => 'http://repo.zabbix.com/zabbix/2.2/rhel/$releasever/$basearch/',
enabled => 1,
gpgcheck => 1,
gpgkey => 'http://repo.zabbix.com/RPM-GPG-KEY-ZABBIX',
}
yumrepo{ 'zabbix_non_supported':
descr => "Zabbix Official Repository non-supported - ${::architecture}",
baseurl => 'http://repo.zabbix.com/non-supported/rhel/6/$basearch/',
baseurl => 'http://repo.zabbix.com/non-supported/rhel/$releasever/$basearch/',
enabled => 1,
gpgcheck => 1,
gpgkey => 'http://repo.zabbix.com/RPM-GPG-KEY-ZABBIX',
Expand Down
18 changes: 9 additions & 9 deletions manifests/server/dbinit.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
exec {'init db - schema':
provider => shell,
#command => "/usr/bin/mysql -h ${db_host} -u ${db_user} -p${db_password} ${db_name} < /usr/share/doc/zabbix-server-mysql*/create/schema.sql",
#command => "/bin/find /usr/share/doc/ -path '*zabbix-server*/create/schema.sql' -exec /usr/bin/mysql -h ${db_host} -u ${db_user} -p${db_password} ${db_name} < {} \;",
#command => "/bin/find /usr/share/doc/ -path '*zabbix-server*/create/schema.sql' -exec /usr/bin/mysql -h ${db_host} -u ${db_user} -p${db_password} ${db_name} < {} \;",
#command => "/bin/find /usr/share/doc/ -path '*zabbix-server*/create/schema.sql' -exec /usr/bin/sed -e 's/ , );/1,1);/g' {} ; | /usr/bin/mysql -h ${db_host} -u ${db_user} -p${db_password} ${db_name}",
# very nasty hack, because commands above don't work
command => "/usr/bin/mysql -h ${db_host} -u ${db_user} -p${db_password} ${db_name} < `/bin/rpm -ql zabbix-server-mysql | grep 'create/schema.sql'`",
Expand All @@ -27,18 +27,18 @@
exec {'init db - images':
provider => shell,
#command => "/usr/bin/mysql -h ${db_host} -u ${db_user} -p${db_password} ${db_name} < /usr/share/doc/zabbix-server-mysql*/create/images.sql",
#command => "/bin/find /usr/share/doc/ -path '*zabbix-server*/create/images.sql' -exec /usr/bin/sed -e 's/ , );/1,1);/g' {} ; | /usr/bin/mysql -h ${db_host} -u ${db_user} -p${db_password} ${db_name}",
#command => "/bin/find /usr/share/doc/ -path '*zabbix-server*/create/images.sql' -exec /usr/bin/sed -e 's/ , );/1,1);/g' {} ; | /usr/bin/mysql -h ${db_host} -u ${db_user} -p${db_password} ${db_name}",
# very nasty hack, because commands above don't work
command => "/usr/bin/mysql -h ${db_host} -u ${db_user} -p${db_password} ${db_name} < `/bin/rpm -ql zabbix-server-mysql | grep 'create/images.sql'`",
unless => "/usr/bin/mysql -h ${db_host} -u ${db_user} -p${db_password} ${db_name} -e 'SELECT name FROM images' | grep -q Cloud",
unless => "/usr/bin/mysql -h ${db_host} -u ${db_user} -p${db_password} ${db_name} -e 'SELECT name FROM images' | grep -q Cloud",
} ->
exec {'init db - data':
provider => shell,
#command => "/usr/bin/mysql -h ${db_host} -u ${db_user} -p${db_password} ${db_name} < /usr/share/doc/zabbix-server-mysql*/create/data.sql",
#command => "/bin/find /usr/share/doc/ -path '*zabbix-server*/create/data.sql' -exec /usr/bin/sed -e 's/ , );/1,1);/g' {} ; | /usr/bin/mysql -h ${db_host} -u ${db_user} -p${db_password} ${db_name}",
#command => "/bin/find /usr/share/doc/ -path '*zabbix-server*/create/data.sql' -exec /usr/bin/sed -e 's/ , );/1,1);/g' {} ; | /usr/bin/mysql -h ${db_host} -u ${db_user} -p${db_password} ${db_name}",
# very nasty hack, because commands above don't work
command => "/usr/bin/mysql -h ${db_host} -u ${db_user} -p${db_password} ${db_name} < `/bin/rpm -ql zabbix-server-mysql | grep 'create/data.sql'`",
unless => "/usr/bin/mysql -h ${db_host} -u ${db_user} -p${db_password} ${db_name} -e 'SELECT name FROM hosts;' | grep -q Template",
command => "/usr/bin/mysql -h ${db_host} -u ${db_user} -p${db_password} ${db_name} < `/bin/rpm -ql zabbix-server-mysql | grep 'create/data.sql'`",
unless => "/usr/bin/mysql -h ${db_host} -u ${db_user} -p${db_password} ${db_name} -e 'SELECT name FROM hosts;' | grep -q Template",
}
}

Expand All @@ -47,17 +47,17 @@
exec {'init db - schema':
#/usr/share/doc/zabbix-server-pgsql-2.2.1/create/schema.sql
command => "/usr/bin/pgsql -h ${db_host} -w ${db_password} -d ${db_name} -U ${db_user} -f /usr/share/zabbix-pgsql/schema.sql",
#unless => ""
#unless => ""
} ->
exec {'init db - images':
#/usr/share/doc/zabbix-server-pgsql-2.2.1/create/images.sql
command => "/usr/bin/pgsql -h ${db_host} -w ${db_password} -d ${db_name} -U ${db_user} -f /usr/share/zabbix-pgsql/images.sql",
#unless => "",
#unless => "",
} ->
exec {'init db - data':
#/usr/share/doc/zabbix-server-pgsql-2.2.1/create/data.sql
command => "/usr/bin/pgsql -h ${db_host} -w ${db_password} -d ${db_name} -U ${db_user} -f /usr/share/zabbix-pgsql/data.sql",
#unless => "",
#unless => "",
}
}

Expand Down