summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--hosts/jenkins/etc/aliases (renamed from etc/aliases)0
l---------hosts/jenkins/etc/apache2/conf-available/munin.conf (renamed from etc/apache2/conf-available/munin.conf)0
-rw-r--r--hosts/jenkins/etc/apache2/ports.conf (renamed from etc/apache2/ports.conf)0
-rw-r--r--hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net (renamed from etc/apache2/sites-available/jenkins.debian.net)0
-rw-r--r--hosts/jenkins/etc/apache2/ssl/gsdomainvalsha2g2r1.crt (renamed from etc/apache2/ssl/gsdomainvalsha2g2r1.crt)0
-rw-r--r--hosts/jenkins/etc/apt/apt.conf.d/30nagios-check-libs (renamed from etc/apt/apt.conf.d/30nagios-check-libs)0
-rw-r--r--hosts/jenkins/etc/apt/apt.conf.d/80proxy (renamed from etc/apt/apt.conf.d/80proxy)0
-rw-r--r--hosts/jenkins/etc/apt/listchanges.conf (renamed from etc/apt/listchanges.conf)0
-rw-r--r--hosts/jenkins/etc/apt/sources.list (renamed from etc/apt/sources.list)0
-rw-r--r--hosts/jenkins/etc/cron-apt/config (renamed from etc/cron-apt/config)0
-rwxr-xr-xhosts/jenkins/etc/cron.d/jenkins (renamed from etc/cron.d/jenkins)0
-rwxr-xr-xhosts/jenkins/etc/cron.daily/jenkins (renamed from etc/cron.daily/jenkins)0
-rw-r--r--hosts/jenkins/etc/default/jenkins (renamed from etc/default/jenkins)0
-rw-r--r--hosts/jenkins/etc/default/shorewall (renamed from etc/default/shorewall)0
-rw-r--r--hosts/jenkins/etc/default/shorewall6 (renamed from etc/default/shorewall6)0
-rw-r--r--hosts/jenkins/etc/logrotate.d/jenkins.debian.net (renamed from etc/logrotate.d/jenkins.debian.net)0
-rw-r--r--hosts/jenkins/etc/munin/apache.conf (renamed from etc/munin/apache.conf)0
-rw-r--r--hosts/jenkins/etc/munin/munin.conf (renamed from etc/munin/munin.conf)0
-rw-r--r--hosts/jenkins/etc/munin/plugin-conf.d/df (renamed from etc/munin/plugin-conf.d/df)0
-rw-r--r--hosts/jenkins/etc/munin/plugin-conf.d/diskstats (renamed from etc/munin/plugin-conf.d/diskstats)0
-rw-r--r--hosts/jenkins/etc/munin/plugin-conf.d/jenkins (renamed from etc/munin/plugin-conf.d/jenkins)0
-rw-r--r--hosts/jenkins/etc/munin/plugin-conf.d/munin-node (renamed from etc/munin/plugin-conf.d/munin-node)0
-rwxr-xr-xhosts/jenkins/etc/munin/plugins/cpu (renamed from etc/munin/plugins/cpu)0
-rwxr-xr-xhosts/jenkins/etc/munin/plugins/iostat_ios (renamed from etc/munin/plugins/iostat_ios)0
-rwxr-xr-xhosts/jenkins/etc/munin/plugins/jenkins_builds (renamed from etc/munin/plugins/jenkins_builds)0
-rwxr-xr-xhosts/jenkins/etc/munin/plugins/jenkins_builds_results (renamed from etc/munin/plugins/jenkins_builds_results)0
-rwxr-xr-xhosts/jenkins/etc/munin/plugins/jenkins_builds_results_summary (renamed from etc/munin/plugins/jenkins_builds_results_summary)0
-rwxr-xr-xhosts/jenkins/etc/munin/plugins/jenkins_builds_running (renamed from etc/munin/plugins/jenkins_builds_running)0
-rwxr-xr-xhosts/jenkins/etc/munin/plugins/jenkins_jobs (renamed from etc/munin/plugins/jenkins_jobs)0
-rwxr-xr-xhosts/jenkins/etc/munin/plugins/munin_stats (renamed from etc/munin/plugins/munin_stats)0
-rw-r--r--hosts/jenkins/etc/munin/static/style-new.css (renamed from etc/munin/static/style-new.css)0
-rw-r--r--hosts/jenkins/etc/munin/templates/partial/navigation.tmpl (renamed from etc/munin/templates/partial/navigation.tmpl)0
-rw-r--r--hosts/jenkins/etc/nagios/check-libs.conf (renamed from etc/nagios/check-libs.conf)0
-rw-r--r--hosts/jenkins/etc/nagios/obsolete-packages-ignore (renamed from etc/nagios/obsolete-packages-ignore)0
-rwxr-xr-xhosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment (renamed from etc/pbuilder/rebuild-hooks/D01_modify_environment)0
-rw-r--r--hosts/jenkins/etc/pbuilderrc (renamed from etc/pbuilderrc)0
-rw-r--r--hosts/jenkins/etc/postfix/main.cf (renamed from etc/postfix/main.cf)0
-rwxr-xr-xhosts/jenkins/etc/rc.local (renamed from etc/rc.local)0
-rw-r--r--hosts/jenkins/etc/schroot/default/fstab (renamed from etc/schroot/default/fstab)0
-rw-r--r--hosts/jenkins/etc/schroot/default/nssdatabases (renamed from etc/schroot/default/nssdatabases)0
-rw-r--r--hosts/jenkins/etc/shorewall/interfaces (renamed from etc/shorewall/interfaces)0
-rw-r--r--hosts/jenkins/etc/shorewall/params (renamed from etc/shorewall/params)0
-rw-r--r--hosts/jenkins/etc/shorewall/policy (renamed from etc/shorewall/policy)0
-rw-r--r--hosts/jenkins/etc/shorewall/rules (renamed from etc/shorewall/rules)0
-rw-r--r--hosts/jenkins/etc/shorewall/shorewall.conf (renamed from etc/shorewall/shorewall.conf)0
-rw-r--r--hosts/jenkins/etc/shorewall/zones (renamed from etc/shorewall/zones)0
-rw-r--r--hosts/jenkins/etc/shorewall6/interfaces (renamed from etc/shorewall6/interfaces)0
-rw-r--r--hosts/jenkins/etc/shorewall6/params (renamed from etc/shorewall6/params)0
-rw-r--r--hosts/jenkins/etc/shorewall6/policy (renamed from etc/shorewall6/policy)0
-rw-r--r--hosts/jenkins/etc/shorewall6/rules (renamed from etc/shorewall6/rules)0
-rw-r--r--hosts/jenkins/etc/shorewall6/shorewall6.conf (renamed from etc/shorewall6/shorewall6.conf)0
-rw-r--r--hosts/jenkins/etc/shorewall6/zones (renamed from etc/shorewall6/zones)0
-rw-r--r--hosts/jenkins/etc/squid3/squid.conf (renamed from etc/squid3/squid.conf)0
-rw-r--r--hosts/jenkins/etc/sudoers.d/jenkins (renamed from etc/sudoers.d/jenkins)0
-rw-r--r--hosts/jenkins/etc/sudoers.d/jenkins-adm (renamed from etc/sudoers.d/jenkins-adm)0
-rwxr-xr-xupdate_jdn.sh2
56 files changed, 1 insertions, 1 deletions
diff --git a/etc/aliases b/hosts/jenkins/etc/aliases
index c968028c..c968028c 100644
--- a/etc/aliases
+++ b/hosts/jenkins/etc/aliases
diff --git a/etc/apache2/conf-available/munin.conf b/hosts/jenkins/etc/apache2/conf-available/munin.conf
index 56fedfa9..56fedfa9 120000
--- a/etc/apache2/conf-available/munin.conf
+++ b/hosts/jenkins/etc/apache2/conf-available/munin.conf
diff --git a/etc/apache2/ports.conf b/hosts/jenkins/etc/apache2/ports.conf
index 7830895d..7830895d 100644
--- a/etc/apache2/ports.conf
+++ b/hosts/jenkins/etc/apache2/ports.conf
diff --git a/etc/apache2/sites-available/jenkins.debian.net b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net
index 668bcf3f..668bcf3f 100644
--- a/etc/apache2/sites-available/jenkins.debian.net
+++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net
diff --git a/etc/apache2/ssl/gsdomainvalsha2g2r1.crt b/hosts/jenkins/etc/apache2/ssl/gsdomainvalsha2g2r1.crt
index 6d67a8d2..6d67a8d2 100644
--- a/etc/apache2/ssl/gsdomainvalsha2g2r1.crt
+++ b/hosts/jenkins/etc/apache2/ssl/gsdomainvalsha2g2r1.crt
diff --git a/etc/apt/apt.conf.d/30nagios-check-libs b/hosts/jenkins/etc/apt/apt.conf.d/30nagios-check-libs
index f3962064..f3962064 100644
--- a/etc/apt/apt.conf.d/30nagios-check-libs
+++ b/hosts/jenkins/etc/apt/apt.conf.d/30nagios-check-libs
diff --git a/etc/apt/apt.conf.d/80proxy b/hosts/jenkins/etc/apt/apt.conf.d/80proxy
index 15a688ea..15a688ea 100644
--- a/etc/apt/apt.conf.d/80proxy
+++ b/hosts/jenkins/etc/apt/apt.conf.d/80proxy
diff --git a/etc/apt/listchanges.conf b/hosts/jenkins/etc/apt/listchanges.conf
index 8b598c0a..8b598c0a 100644
--- a/etc/apt/listchanges.conf
+++ b/hosts/jenkins/etc/apt/listchanges.conf
diff --git a/etc/apt/sources.list b/hosts/jenkins/etc/apt/sources.list
index 3bca4533..3bca4533 100644
--- a/etc/apt/sources.list
+++ b/hosts/jenkins/etc/apt/sources.list
diff --git a/etc/cron-apt/config b/hosts/jenkins/etc/cron-apt/config
index d36badce..d36badce 100644
--- a/etc/cron-apt/config
+++ b/hosts/jenkins/etc/cron-apt/config
diff --git a/etc/cron.d/jenkins b/hosts/jenkins/etc/cron.d/jenkins
index f2814940..f2814940 100755
--- a/etc/cron.d/jenkins
+++ b/hosts/jenkins/etc/cron.d/jenkins
diff --git a/etc/cron.daily/jenkins b/hosts/jenkins/etc/cron.daily/jenkins
index 47e52f9b..47e52f9b 100755
--- a/etc/cron.daily/jenkins
+++ b/hosts/jenkins/etc/cron.daily/jenkins
diff --git a/etc/default/jenkins b/hosts/jenkins/etc/default/jenkins
index 744fca61..744fca61 100644
--- a/etc/default/jenkins
+++ b/hosts/jenkins/etc/default/jenkins
diff --git a/etc/default/shorewall b/hosts/jenkins/etc/default/shorewall
index 9dfed2f8..9dfed2f8 100644
--- a/etc/default/shorewall
+++ b/hosts/jenkins/etc/default/shorewall
diff --git a/etc/default/shorewall6 b/hosts/jenkins/etc/default/shorewall6
index babe9782..babe9782 100644
--- a/etc/default/shorewall6
+++ b/hosts/jenkins/etc/default/shorewall6
diff --git a/etc/logrotate.d/jenkins.debian.net b/hosts/jenkins/etc/logrotate.d/jenkins.debian.net
index 995de184..995de184 100644
--- a/etc/logrotate.d/jenkins.debian.net
+++ b/hosts/jenkins/etc/logrotate.d/jenkins.debian.net
diff --git a/etc/munin/apache.conf b/hosts/jenkins/etc/munin/apache.conf
index 95786274..95786274 100644
--- a/etc/munin/apache.conf
+++ b/hosts/jenkins/etc/munin/apache.conf
diff --git a/etc/munin/munin.conf b/hosts/jenkins/etc/munin/munin.conf
index c979757a..c979757a 100644
--- a/etc/munin/munin.conf
+++ b/hosts/jenkins/etc/munin/munin.conf
diff --git a/etc/munin/plugin-conf.d/df b/hosts/jenkins/etc/munin/plugin-conf.d/df
index 1f1cb157..1f1cb157 100644
--- a/etc/munin/plugin-conf.d/df
+++ b/hosts/jenkins/etc/munin/plugin-conf.d/df
diff --git a/etc/munin/plugin-conf.d/diskstats b/hosts/jenkins/etc/munin/plugin-conf.d/diskstats
index 8cf14814..8cf14814 100644
--- a/etc/munin/plugin-conf.d/diskstats
+++ b/hosts/jenkins/etc/munin/plugin-conf.d/diskstats
diff --git a/etc/munin/plugin-conf.d/jenkins b/hosts/jenkins/etc/munin/plugin-conf.d/jenkins
index e88a6462..e88a6462 100644
--- a/etc/munin/plugin-conf.d/jenkins
+++ b/hosts/jenkins/etc/munin/plugin-conf.d/jenkins
diff --git a/etc/munin/plugin-conf.d/munin-node b/hosts/jenkins/etc/munin/plugin-conf.d/munin-node
index e766928f..e766928f 100644
--- a/etc/munin/plugin-conf.d/munin-node
+++ b/hosts/jenkins/etc/munin/plugin-conf.d/munin-node
diff --git a/etc/munin/plugins/cpu b/hosts/jenkins/etc/munin/plugins/cpu
index b66ed381..b66ed381 100755
--- a/etc/munin/plugins/cpu
+++ b/hosts/jenkins/etc/munin/plugins/cpu
diff --git a/etc/munin/plugins/iostat_ios b/hosts/jenkins/etc/munin/plugins/iostat_ios
index 94c2272e..94c2272e 100755
--- a/etc/munin/plugins/iostat_ios
+++ b/hosts/jenkins/etc/munin/plugins/iostat_ios
diff --git a/etc/munin/plugins/jenkins_builds b/hosts/jenkins/etc/munin/plugins/jenkins_builds
index 3010e393..3010e393 100755
--- a/etc/munin/plugins/jenkins_builds
+++ b/hosts/jenkins/etc/munin/plugins/jenkins_builds
diff --git a/etc/munin/plugins/jenkins_builds_results b/hosts/jenkins/etc/munin/plugins/jenkins_builds_results
index 596281ff..596281ff 100755
--- a/etc/munin/plugins/jenkins_builds_results
+++ b/hosts/jenkins/etc/munin/plugins/jenkins_builds_results
diff --git a/etc/munin/plugins/jenkins_builds_results_summary b/hosts/jenkins/etc/munin/plugins/jenkins_builds_results_summary
index b4f5b540..b4f5b540 100755
--- a/etc/munin/plugins/jenkins_builds_results_summary
+++ b/hosts/jenkins/etc/munin/plugins/jenkins_builds_results_summary
diff --git a/etc/munin/plugins/jenkins_builds_running b/hosts/jenkins/etc/munin/plugins/jenkins_builds_running
index 24084f10..24084f10 100755
--- a/etc/munin/plugins/jenkins_builds_running
+++ b/hosts/jenkins/etc/munin/plugins/jenkins_builds_running
diff --git a/etc/munin/plugins/jenkins_jobs b/hosts/jenkins/etc/munin/plugins/jenkins_jobs
index e7f8e219..e7f8e219 100755
--- a/etc/munin/plugins/jenkins_jobs
+++ b/hosts/jenkins/etc/munin/plugins/jenkins_jobs
diff --git a/etc/munin/plugins/munin_stats b/hosts/jenkins/etc/munin/plugins/munin_stats
index 8c7c82a2..8c7c82a2 100755
--- a/etc/munin/plugins/munin_stats
+++ b/hosts/jenkins/etc/munin/plugins/munin_stats
diff --git a/etc/munin/static/style-new.css b/hosts/jenkins/etc/munin/static/style-new.css
index 28ecea40..28ecea40 100644
--- a/etc/munin/static/style-new.css
+++ b/hosts/jenkins/etc/munin/static/style-new.css
diff --git a/etc/munin/templates/partial/navigation.tmpl b/hosts/jenkins/etc/munin/templates/partial/navigation.tmpl
index d1cbe07e..d1cbe07e 100644
--- a/etc/munin/templates/partial/navigation.tmpl
+++ b/hosts/jenkins/etc/munin/templates/partial/navigation.tmpl
diff --git a/etc/nagios/check-libs.conf b/hosts/jenkins/etc/nagios/check-libs.conf
index 4279937f..4279937f 100644
--- a/etc/nagios/check-libs.conf
+++ b/hosts/jenkins/etc/nagios/check-libs.conf
diff --git a/etc/nagios/obsolete-packages-ignore b/hosts/jenkins/etc/nagios/obsolete-packages-ignore
index e69de29b..e69de29b 100644
--- a/etc/nagios/obsolete-packages-ignore
+++ b/hosts/jenkins/etc/nagios/obsolete-packages-ignore
diff --git a/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
index d9550045..d9550045 100755
--- a/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
diff --git a/etc/pbuilderrc b/hosts/jenkins/etc/pbuilderrc
index 6812ce26..6812ce26 100644
--- a/etc/pbuilderrc
+++ b/hosts/jenkins/etc/pbuilderrc
diff --git a/etc/postfix/main.cf b/hosts/jenkins/etc/postfix/main.cf
index 2589e2c4..2589e2c4 100644
--- a/etc/postfix/main.cf
+++ b/hosts/jenkins/etc/postfix/main.cf
diff --git a/etc/rc.local b/hosts/jenkins/etc/rc.local
index 1eac9049..1eac9049 100755
--- a/etc/rc.local
+++ b/hosts/jenkins/etc/rc.local
diff --git a/etc/schroot/default/fstab b/hosts/jenkins/etc/schroot/default/fstab
index 74468dd2..74468dd2 100644
--- a/etc/schroot/default/fstab
+++ b/hosts/jenkins/etc/schroot/default/fstab
diff --git a/etc/schroot/default/nssdatabases b/hosts/jenkins/etc/schroot/default/nssdatabases
index 72615e5d..72615e5d 100644
--- a/etc/schroot/default/nssdatabases
+++ b/hosts/jenkins/etc/schroot/default/nssdatabases
diff --git a/etc/shorewall/interfaces b/hosts/jenkins/etc/shorewall/interfaces
index 21cad8cc..21cad8cc 100644
--- a/etc/shorewall/interfaces
+++ b/hosts/jenkins/etc/shorewall/interfaces
diff --git a/etc/shorewall/params b/hosts/jenkins/etc/shorewall/params
index a60512b4..a60512b4 100644
--- a/etc/shorewall/params
+++ b/hosts/jenkins/etc/shorewall/params
diff --git a/etc/shorewall/policy b/hosts/jenkins/etc/shorewall/policy
index b6edc636..b6edc636 100644
--- a/etc/shorewall/policy
+++ b/hosts/jenkins/etc/shorewall/policy
diff --git a/etc/shorewall/rules b/hosts/jenkins/etc/shorewall/rules
index 1b7c8ffe..1b7c8ffe 100644
--- a/etc/shorewall/rules
+++ b/hosts/jenkins/etc/shorewall/rules
diff --git a/etc/shorewall/shorewall.conf b/hosts/jenkins/etc/shorewall/shorewall.conf
index f491c51b..f491c51b 100644
--- a/etc/shorewall/shorewall.conf
+++ b/hosts/jenkins/etc/shorewall/shorewall.conf
diff --git a/etc/shorewall/zones b/hosts/jenkins/etc/shorewall/zones
index 5084ff11..5084ff11 100644
--- a/etc/shorewall/zones
+++ b/hosts/jenkins/etc/shorewall/zones
diff --git a/etc/shorewall6/interfaces b/hosts/jenkins/etc/shorewall6/interfaces
index ba3f5827..ba3f5827 100644
--- a/etc/shorewall6/interfaces
+++ b/hosts/jenkins/etc/shorewall6/interfaces
diff --git a/etc/shorewall6/params b/hosts/jenkins/etc/shorewall6/params
index b9772415..b9772415 100644
--- a/etc/shorewall6/params
+++ b/hosts/jenkins/etc/shorewall6/params
diff --git a/etc/shorewall6/policy b/hosts/jenkins/etc/shorewall6/policy
index da7019e1..da7019e1 100644
--- a/etc/shorewall6/policy
+++ b/hosts/jenkins/etc/shorewall6/policy
diff --git a/etc/shorewall6/rules b/hosts/jenkins/etc/shorewall6/rules
index e051f8e0..e051f8e0 100644
--- a/etc/shorewall6/rules
+++ b/hosts/jenkins/etc/shorewall6/rules
diff --git a/etc/shorewall6/shorewall6.conf b/hosts/jenkins/etc/shorewall6/shorewall6.conf
index a2f75cfd..a2f75cfd 100644
--- a/etc/shorewall6/shorewall6.conf
+++ b/hosts/jenkins/etc/shorewall6/shorewall6.conf
diff --git a/etc/shorewall6/zones b/hosts/jenkins/etc/shorewall6/zones
index 6a983a30..6a983a30 100644
--- a/etc/shorewall6/zones
+++ b/hosts/jenkins/etc/shorewall6/zones
diff --git a/etc/squid3/squid.conf b/hosts/jenkins/etc/squid3/squid.conf
index d7b6fabe..d7b6fabe 100644
--- a/etc/squid3/squid.conf
+++ b/hosts/jenkins/etc/squid3/squid.conf
diff --git a/etc/sudoers.d/jenkins b/hosts/jenkins/etc/sudoers.d/jenkins
index d75335f9..d75335f9 100644
--- a/etc/sudoers.d/jenkins
+++ b/hosts/jenkins/etc/sudoers.d/jenkins
diff --git a/etc/sudoers.d/jenkins-adm b/hosts/jenkins/etc/sudoers.d/jenkins-adm
index e585d03b..e585d03b 100644
--- a/etc/sudoers.d/jenkins-adm
+++ b/hosts/jenkins/etc/sudoers.d/jenkins-adm
diff --git a/update_jdn.sh b/update_jdn.sh
index 932e21e0..02e37c2a 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -204,7 +204,7 @@ fi
# deploy package configuration in /etc
#
cd $BASEDIR
-sudo cp --preserve=mode,timestamps -r etc/* /etc
+sudo cp --preserve=mode,timestamps -r hosts/jenkins/etc/* /etc
#
# more configuration than a simple cp can do