18 Commits (20221e497ab28316a804d3a97043dafbac795674)

Author	SHA1	Message	Date
Michael Prokop	a42248419e	TT#22411 Fix spelling mistakes/typos ... s/Syncronizes/Synchronizes/ s/Wheras/Whereas/ s/configuation/configuration/ s/exisiting/existing/ s/explicitely/explicitly/ s/files files/files/ s/has has/has/ s/initialise initialise/initialise/ s/mulitple/multiple/ s/ouput/output/ s/propogates/propagates/ s/successfull/successful/ s/syncronizes/synchronizes/ s/the the/the/ s/uncommited/uncommitted/ Change-Id: Id13ec889c5de620b675e357d99066688cfc97617	9 years ago
Michael Prokop	acfa825767	MT#16391 Initial tests using pytest ... The old testsuite wasn't updated for way too long and since ngcpcfg receives more and more features we need a decent test coverage. pytest seems to provide the right level of abstraction, excellent fixtures and junit-xml reporting as needed. Inspired by Vincent Bernat's https://github.com/vincentbernat/lldpd/tree/master/tests/integration Thanks Victor Seva <vseva@sipwise.com>, Vincent Bernat <vincent@bernat.im>, Christian Hofstaedtler <christian@hofstaedtler.name> and Lukas Prokop <admin@lukas-prokop.at> for feedback, inspiration and help Change-Id: Iffed87e8cc540169bed89c00967a03e80859179e	9 years ago
Michael Prokop	e00d7e36bc	MT#22241 Support hostname and pairname specific templates (PRO-/CARRIER-only) ... If we have multiple web0X proxies but need specific templates on just one of those pairs then we need to support *.customtt.tt2.$pairname + *.tt2.$pairname templates. While at it also support *.customtt.tt2.$nodename + foo.tt2.$nodename (where nodename is actual hostname and not sp1 or sp2 as already supported already). Test script for demonstration (especially for precedence): mkdir /etc/ngcp-config/templates/etc/mika cd /etc/ngcp-config/templates/etc/mika hostname=$(hostname) # e.g. web01b pairname=${hostname%[ab]} # e.g. web01 nodename=$(cat /etc/ngcp_nodename) # e.g. sp2 for file in foo.customtt.tt2.$hostname foo.customtt.tt2.$pairname foo.customtt.tt2.$nodename foo.customtt.tt2 foo.tt2.$hostname foo.tt2.$pairname foo.tt2.$nodename foo.tt2 ; do echo $file > $file ; done for file in foo.customtt.tt2.$hostname foo.customtt.tt2.$pairname foo.customtt.tt2.$nodename foo.customtt.tt2 foo.tt2.$hostname foo.tt2.$pairname foo.tt2.$nodename foo.tt2 ; do ngcpcfg build /etc/mika/ >/dev/null if [ "$(cat /etc/mika/foo)" = "$file" ] ; then echo "Content of file /etc/mika/foo matching $file" rm "$file" ; rm /etc/mika/foo else echo "Problem with precedence of file $file" return 1 fi done Change-Id: If7c222374bb56d7bf243200b37a414e39e050cd4	10 years ago
Michael Prokop	08f68c829b	MT#22361 Remember file permissions through pre-commit hook + restore-permissions helper script ... Git doesn't track file permissions (except for the executable flag). For sensitive data (like the 'ssl' directory and file 'constants.yml' with passwords included) we've to prevent non-root users from accessing those files. hooks/pre-commit is inspired and based on the implementation as present in etckeeper (and luckily we're license compatible) and takes care of storing the file permissions inside file /etc/ngcp-config/.ngcpcfg_perms. The restore-permissions helper script takes care of restoring the permissions after cloning the ngcpcfg repository via ngcpcfg itself (being actions decrypt, pull (PRO-only) + initialise (PRO-only)). It can be executed manually as well via `usr/share/ngcp-ngcpcfg/helper/restore-permissions /etc/ngcp-config/` (or wherever the according ngcpcfg repository is placed at). Regarding the commit integration: git(1) itself doesn't track file permissions, so we can't detect changes to file permissions using git itself. Our new pre-commit hook records file permissions via the .ngcpcfg_perms file. Now by just invoking it during 'ngcpcfg commit' time we can ensure that even if there have been any file permission changes in the working directory the file .ngcpcfg_perms is then up2date and committed. JFTR: The solution via the git pre-commit hook ensures that no matter whether you're using 'ngcpcfg commit …' or 'git commit …' you always get the file permissions handled via .ngcpcfg_perms. Now if you want to change file permissions in a clean working directory and commit *without* using 'ngcpcfg commit' but directly via git itself then you've to use 'git commit --allow-empty ...' and thanks to the pre-commit hook the file .ngcpcfg_perms will still be up2date. Change-Id: I84d608585c626b52112ff649893e232e441c59d8	10 years ago
Michael Prokop	1fd2247ce3	MT#18811 Send debug output to stderr ... If we send debug output to stdout then its output might get used in variable assignments, causing debug runs to have different results than the non-debug ones, like: | root@sp2:/etc/ngcp-config# DEBUG=1 ngcpcfg build --no-action-failure /etc/mysql/ | 2016-03-30 18:58:00: DEBUG: sourced configuration file /etc/ngcp-config/ngcpcfg.cfg | 2016-03-30 18:58:00: DEBUG: sourced configuration file /etc/ngcp-config/ngcpcfg.d/shared_storage.cfg | 2016-03-30 18:58:00: DEBUG: /usr/share/ngcp-ngcpcfg/scripts//build --no-action-failure /etc/mysql/ | 2016-03-30 18:58:00: DEBUG: sourced configuration file /etc/ngcp-config/ngcpcfg.cfg | 2016-03-30 18:58:00: DEBUG: sourced configuration file /etc/ngcp-config/ngcpcfg.d/shared_storage.cfg | 2016-03-30 18:58:00: DEBUG: sourced configuration file /etc/ngcp-config/ngcpcfg.cfg | 2016-03-30 18:58:00: DEBUG: sourced configuration file /etc/ngcp-config/ngcpcfg.d/shared_storage.cfg | 2016-03-30 18:58:00: Error: branch '2016-03-30 18:58:00: DEBUG: get_active_branch master | 2016-03-30 18:58:00: DEBUG: cd /etc/ngcp-config | 2016-03-30 18:58:00: DEBUG: current_branch = master | master' in '/etc/ngcp-config' active - please switch to branch 'master' before continuing. Change-Id: I58a8882054b9accdff14d79e9a963109f2bbb91f	10 years ago
Michael Prokop	4fd512261b	MT#16393 Check for branch 'master' being active ... Verify that the user is operating on branch master, otherwise the result might be unexpected. If branch master is checked out: | root@spce:/etc/ngcp-config# ngcpcfg check | root@spce:/etc/ngcp-config# ngcpcfg status | [...] | 2016-02-23 05:48:32: Checking currently active branch: | 2016-02-23 05:48:32: OK: branch master active If a branch other than 'master' is checked out: | root@spce:/etc/ngcp-config# ngcpcfg check | 2016-02-23 05:47:42: Error: branch 'mika' in '/etc/ngcp-config' active - please switch to branch 'master' before continuing. | root@spce:/etc/ngcp-config# echo $? | 1 | root@spce:/etc/ngcp-config# ngcpcfg status | [...] | 2016-02-23 05:47:47: Checking currently active branch: | 2016-02-23 05:47:47: ACTION_NEEDED: branch 'mika' active - please switch to branch 'master' | [...] Change-Id: I5df92075905cafa3b714211581c8cfe749df04ba	10 years ago
Guillem Jover	b789568b73	MT#17219 Use $@ instead of $* when we need to preserve argument grouping ... Using $* in some of these places implies losing data about what constituted a single argument. Change-Id: Ic072e68320d65ac86392c31d7665529b913232fd	11 years ago
Michael Prokop	c9b62658a1	MT#15973 Report in 'status' action when build/apply run is needed ... In a previous implementation using timestamps we ran into timing problems on slower systems. So instead lets record the git commit ID of the latest ngcpcfg commit and check whether we have a match between this commit and an according ngcpcfg build. If the "ngcpcfg build" was executed without an "ngcpcfg commit" before then we mark it as dirty since we don't have an according git commit available for testing against. Since that's a common workflow we don't report it as a real problem though, instead we inform the user using: | OK: nothing to build (latest build newer than latest commit) As we commit AFTER the build in the apply action we can use a workaround for this situation, so build and commit state match with each other in that case then. Change-Id: I48e32db6f42b53fe97a0b88805e7ddbee8576133	11 years ago
Michael Prokop	0d828d4108	MT#15973 Revert "MT#15973 Report in 'status' action when build/apply run is needed" ... This reverts commit db373d3927. Conflicts: etc/ngcp-config/ngcpcfg.cfg Until we've a working solution for this let's revert the broken change so we avoid this being a release stopper. Change-Id: If03d9b3913de23c698b430d583dc7babfcc4ff04	11 years ago
Michael Prokop	db373d3927	MT#15973 Report in 'status' action when build/apply run is needed ... If the latest git commit has a newer timestamp than our latest "build" action then a "build" (or apply) run is required, inform the user about it. Change-Id: I83e2ff47ba54da733d368d78b6616d13d31a66d4	11 years ago
Alexander Lutay	cad0d3c1b7	MT#15803 Introducing the new function to provide current branch status ... Previously we guessed the status of current branch by parsing 'git status' output. Unfortunately we have to care about a corner cases in this way. In the same time we can easily consider current branch status comparing commits. Introducing the new function to provide current branch status: up-2-date, ahead, behind or diverged with origin. Change-Id: I4d09c8867069ccafc97e5d31638e8bc94caa58cd	11 years ago
Michael Prokop	2deea0fb39	MT#9557 Provide timestamps in console output ... Change-Id: I5be915fa876014cbb9c792b03be325d6595daac9	11 years ago
Victor Seva	5ed308c1a0	MT#8763 allow multiple config directories on templates not only "/etc" ... Change-Id: I1c8fc5fd45a0c34ba7542ddc6ce24793bd568cb5	12 years ago
Victor Seva	d9e6ba263d	MT#8067 check nodename no hostname to exclude ourselves	12 years ago
Kirill Solomko	ec2fa4eb1a	MT#4585 - added "--no-db-sync" option that skips sync-db/sync-constants	13 years ago
Michael Prokop	f2e9a5e8e6	MT#4295 Be more strict with option handling when passing file names to grep	13 years ago
Michael Prokop	c3e1cb68d4	support additional configuration yml files via configuration directory ... Files in configuration directory EXTRA_CONFIG_DIR (being /etc/ngcp-config/config.d/ by default) with the suffix yml (so e.g. a file named pbx.yml can be shipped by an external Debian package) are additionally taken into consideration as main configuration files. Those extra configuration file(s) have higher precedence than the other yml configuration files (config.yml, network.yml,...), *except* for constants.yml which has the power to override all settings, including the ones from files inside EXTRA_CONFIG_DIR. Closes: sipwise-#3059	13 years ago
Michael Prokop	3436c08361	Initial checkin	13 years ago