From 315ead533e3d4e67ce3908a13ebe5b75ef9060c4 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 27 Jul 2015 14:31:57 +0200 Subject: [PATCH] move etc to hosts/jenkins/etc --- {etc => hosts/jenkins/etc}/aliases | 0 {etc => hosts/jenkins/etc}/apache2/conf-available/munin.conf | 0 {etc => hosts/jenkins/etc}/apache2/ports.conf | 0 .../jenkins/etc}/apache2/sites-available/jenkins.debian.net | 0 {etc => hosts/jenkins/etc}/apache2/ssl/gsdomainvalsha2g2r1.crt | 0 {etc => hosts/jenkins/etc}/apt/apt.conf.d/30nagios-check-libs | 0 {etc => hosts/jenkins/etc}/apt/apt.conf.d/80proxy | 0 {etc => hosts/jenkins/etc}/apt/listchanges.conf | 0 {etc => hosts/jenkins/etc}/apt/sources.list | 0 {etc => hosts/jenkins/etc}/cron-apt/config | 0 {etc => hosts/jenkins/etc}/cron.d/jenkins | 0 {etc => hosts/jenkins/etc}/cron.daily/jenkins | 0 {etc => hosts/jenkins/etc}/default/jenkins | 0 {etc => hosts/jenkins/etc}/default/shorewall | 0 {etc => hosts/jenkins/etc}/default/shorewall6 | 0 {etc => hosts/jenkins/etc}/logrotate.d/jenkins.debian.net | 0 {etc => hosts/jenkins/etc}/munin/apache.conf | 0 {etc => hosts/jenkins/etc}/munin/munin.conf | 0 {etc => hosts/jenkins/etc}/munin/plugin-conf.d/df | 0 {etc => hosts/jenkins/etc}/munin/plugin-conf.d/diskstats | 0 {etc => hosts/jenkins/etc}/munin/plugin-conf.d/jenkins | 0 {etc => hosts/jenkins/etc}/munin/plugin-conf.d/munin-node | 0 {etc => hosts/jenkins/etc}/munin/plugins/cpu | 0 {etc => hosts/jenkins/etc}/munin/plugins/iostat_ios | 0 {etc => hosts/jenkins/etc}/munin/plugins/jenkins_builds | 0 {etc => hosts/jenkins/etc}/munin/plugins/jenkins_builds_results | 0 .../jenkins/etc}/munin/plugins/jenkins_builds_results_summary | 0 {etc => hosts/jenkins/etc}/munin/plugins/jenkins_builds_running | 0 {etc => hosts/jenkins/etc}/munin/plugins/jenkins_jobs | 0 {etc => hosts/jenkins/etc}/munin/plugins/munin_stats | 0 {etc => hosts/jenkins/etc}/munin/static/style-new.css | 0 .../jenkins/etc}/munin/templates/partial/navigation.tmpl | 0 {etc => hosts/jenkins/etc}/nagios/check-libs.conf | 0 {etc => hosts/jenkins/etc}/nagios/obsolete-packages-ignore | 0 .../jenkins/etc}/pbuilder/rebuild-hooks/D01_modify_environment | 0 {etc => hosts/jenkins/etc}/pbuilderrc | 0 {etc => hosts/jenkins/etc}/postfix/main.cf | 0 {etc => hosts/jenkins/etc}/rc.local | 0 {etc => hosts/jenkins/etc}/schroot/default/fstab | 0 {etc => hosts/jenkins/etc}/schroot/default/nssdatabases | 0 {etc => hosts/jenkins/etc}/shorewall/interfaces | 0 {etc => hosts/jenkins/etc}/shorewall/params | 0 {etc => hosts/jenkins/etc}/shorewall/policy | 0 {etc => hosts/jenkins/etc}/shorewall/rules | 0 {etc => hosts/jenkins/etc}/shorewall/shorewall.conf | 0 {etc => hosts/jenkins/etc}/shorewall/zones | 0 {etc => hosts/jenkins/etc}/shorewall6/interfaces | 0 {etc => hosts/jenkins/etc}/shorewall6/params | 0 {etc => hosts/jenkins/etc}/shorewall6/policy | 0 {etc => hosts/jenkins/etc}/shorewall6/rules | 0 {etc => hosts/jenkins/etc}/shorewall6/shorewall6.conf | 0 {etc => hosts/jenkins/etc}/shorewall6/zones | 0 {etc => hosts/jenkins/etc}/squid3/squid.conf | 0 {etc => hosts/jenkins/etc}/sudoers.d/jenkins | 0 {etc => hosts/jenkins/etc}/sudoers.d/jenkins-adm | 0 update_jdn.sh | 2 +- 56 files changed, 1 insertion(+), 1 deletion(-) rename {etc => hosts/jenkins/etc}/aliases (100%) rename {etc => hosts/jenkins/etc}/apache2/conf-available/munin.conf (100%) rename {etc => hosts/jenkins/etc}/apache2/ports.conf (100%) rename {etc => hosts/jenkins/etc}/apache2/sites-available/jenkins.debian.net (100%) rename {etc => hosts/jenkins/etc}/apache2/ssl/gsdomainvalsha2g2r1.crt (100%) rename {etc => hosts/jenkins/etc}/apt/apt.conf.d/30nagios-check-libs (100%) rename {etc => hosts/jenkins/etc}/apt/apt.conf.d/80proxy (100%) rename {etc => hosts/jenkins/etc}/apt/listchanges.conf (100%) rename {etc => hosts/jenkins/etc}/apt/sources.list (100%) rename {etc => hosts/jenkins/etc}/cron-apt/config (100%) rename {etc => hosts/jenkins/etc}/cron.d/jenkins (100%) rename {etc => hosts/jenkins/etc}/cron.daily/jenkins (100%) rename {etc => hosts/jenkins/etc}/default/jenkins (100%) rename {etc => hosts/jenkins/etc}/default/shorewall (100%) rename {etc => hosts/jenkins/etc}/default/shorewall6 (100%) rename {etc => hosts/jenkins/etc}/logrotate.d/jenkins.debian.net (100%) rename {etc => hosts/jenkins/etc}/munin/apache.conf (100%) rename {etc => hosts/jenkins/etc}/munin/munin.conf (100%) rename {etc => hosts/jenkins/etc}/munin/plugin-conf.d/df (100%) rename {etc => hosts/jenkins/etc}/munin/plugin-conf.d/diskstats (100%) rename {etc => hosts/jenkins/etc}/munin/plugin-conf.d/jenkins (100%) rename {etc => hosts/jenkins/etc}/munin/plugin-conf.d/munin-node (100%) rename {etc => hosts/jenkins/etc}/munin/plugins/cpu (100%) rename {etc => hosts/jenkins/etc}/munin/plugins/iostat_ios (100%) rename {etc => hosts/jenkins/etc}/munin/plugins/jenkins_builds (100%) rename {etc => hosts/jenkins/etc}/munin/plugins/jenkins_builds_results (100%) rename {etc => hosts/jenkins/etc}/munin/plugins/jenkins_builds_results_summary (100%) rename {etc => hosts/jenkins/etc}/munin/plugins/jenkins_builds_running (100%) rename {etc => hosts/jenkins/etc}/munin/plugins/jenkins_jobs (100%) rename {etc => hosts/jenkins/etc}/munin/plugins/munin_stats (100%) rename {etc => hosts/jenkins/etc}/munin/static/style-new.css (100%) rename {etc => hosts/jenkins/etc}/munin/templates/partial/navigation.tmpl (100%) rename {etc => hosts/jenkins/etc}/nagios/check-libs.conf (100%) rename {etc => hosts/jenkins/etc}/nagios/obsolete-packages-ignore (100%) rename {etc => hosts/jenkins/etc}/pbuilder/rebuild-hooks/D01_modify_environment (100%) rename {etc => hosts/jenkins/etc}/pbuilderrc (100%) rename {etc => hosts/jenkins/etc}/postfix/main.cf (100%) rename {etc => hosts/jenkins/etc}/rc.local (100%) rename {etc => hosts/jenkins/etc}/schroot/default/fstab (100%) rename {etc => hosts/jenkins/etc}/schroot/default/nssdatabases (100%) rename {etc => hosts/jenkins/etc}/shorewall/interfaces (100%) rename {etc => hosts/jenkins/etc}/shorewall/params (100%) rename {etc => hosts/jenkins/etc}/shorewall/policy (100%) rename {etc => hosts/jenkins/etc}/shorewall/rules (100%) rename {etc => hosts/jenkins/etc}/shorewall/shorewall.conf (100%) rename {etc => hosts/jenkins/etc}/shorewall/zones (100%) rename {etc => hosts/jenkins/etc}/shorewall6/interfaces (100%) rename {etc => hosts/jenkins/etc}/shorewall6/params (100%) rename {etc => hosts/jenkins/etc}/shorewall6/policy (100%) rename {etc => hosts/jenkins/etc}/shorewall6/rules (100%) rename {etc => hosts/jenkins/etc}/shorewall6/shorewall6.conf (100%) rename {etc => hosts/jenkins/etc}/shorewall6/zones (100%) rename {etc => hosts/jenkins/etc}/squid3/squid.conf (100%) rename {etc => hosts/jenkins/etc}/sudoers.d/jenkins (100%) rename {etc => hosts/jenkins/etc}/sudoers.d/jenkins-adm (100%) diff --git a/etc/aliases b/hosts/jenkins/etc/aliases similarity index 100% rename from etc/aliases rename to hosts/jenkins/etc/aliases diff --git a/etc/apache2/conf-available/munin.conf b/hosts/jenkins/etc/apache2/conf-available/munin.conf similarity index 100% rename from etc/apache2/conf-available/munin.conf rename to hosts/jenkins/etc/apache2/conf-available/munin.conf diff --git a/etc/apache2/ports.conf b/hosts/jenkins/etc/apache2/ports.conf similarity index 100% rename from etc/apache2/ports.conf rename to 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 similarity index 100% rename from etc/apache2/sites-available/jenkins.debian.net rename to 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 similarity index 100% rename from etc/apache2/ssl/gsdomainvalsha2g2r1.crt rename to 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 similarity index 100% rename from etc/apt/apt.conf.d/30nagios-check-libs rename to 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 similarity index 100% rename from etc/apt/apt.conf.d/80proxy rename to hosts/jenkins/etc/apt/apt.conf.d/80proxy diff --git a/etc/apt/listchanges.conf b/hosts/jenkins/etc/apt/listchanges.conf similarity index 100% rename from etc/apt/listchanges.conf rename to hosts/jenkins/etc/apt/listchanges.conf diff --git a/etc/apt/sources.list b/hosts/jenkins/etc/apt/sources.list similarity index 100% rename from etc/apt/sources.list rename to hosts/jenkins/etc/apt/sources.list diff --git a/etc/cron-apt/config b/hosts/jenkins/etc/cron-apt/config similarity index 100% rename from etc/cron-apt/config rename to hosts/jenkins/etc/cron-apt/config diff --git a/etc/cron.d/jenkins b/hosts/jenkins/etc/cron.d/jenkins similarity index 100% rename from etc/cron.d/jenkins rename to hosts/jenkins/etc/cron.d/jenkins diff --git a/etc/cron.daily/jenkins b/hosts/jenkins/etc/cron.daily/jenkins similarity index 100% rename from etc/cron.daily/jenkins rename to hosts/jenkins/etc/cron.daily/jenkins diff --git a/etc/default/jenkins b/hosts/jenkins/etc/default/jenkins similarity index 100% rename from etc/default/jenkins rename to hosts/jenkins/etc/default/jenkins diff --git a/etc/default/shorewall b/hosts/jenkins/etc/default/shorewall similarity index 100% rename from etc/default/shorewall rename to hosts/jenkins/etc/default/shorewall diff --git a/etc/default/shorewall6 b/hosts/jenkins/etc/default/shorewall6 similarity index 100% rename from etc/default/shorewall6 rename to hosts/jenkins/etc/default/shorewall6 diff --git a/etc/logrotate.d/jenkins.debian.net b/hosts/jenkins/etc/logrotate.d/jenkins.debian.net similarity index 100% rename from etc/logrotate.d/jenkins.debian.net rename to hosts/jenkins/etc/logrotate.d/jenkins.debian.net diff --git a/etc/munin/apache.conf b/hosts/jenkins/etc/munin/apache.conf similarity index 100% rename from etc/munin/apache.conf rename to hosts/jenkins/etc/munin/apache.conf diff --git a/etc/munin/munin.conf b/hosts/jenkins/etc/munin/munin.conf similarity index 100% rename from etc/munin/munin.conf rename to hosts/jenkins/etc/munin/munin.conf diff --git a/etc/munin/plugin-conf.d/df b/hosts/jenkins/etc/munin/plugin-conf.d/df similarity index 100% rename from etc/munin/plugin-conf.d/df rename to 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 similarity index 100% rename from etc/munin/plugin-conf.d/diskstats rename to 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 similarity index 100% rename from etc/munin/plugin-conf.d/jenkins rename to 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 similarity index 100% rename from etc/munin/plugin-conf.d/munin-node rename to hosts/jenkins/etc/munin/plugin-conf.d/munin-node diff --git a/etc/munin/plugins/cpu b/hosts/jenkins/etc/munin/plugins/cpu similarity index 100% rename from etc/munin/plugins/cpu rename to hosts/jenkins/etc/munin/plugins/cpu diff --git a/etc/munin/plugins/iostat_ios b/hosts/jenkins/etc/munin/plugins/iostat_ios similarity index 100% rename from etc/munin/plugins/iostat_ios rename to hosts/jenkins/etc/munin/plugins/iostat_ios diff --git a/etc/munin/plugins/jenkins_builds b/hosts/jenkins/etc/munin/plugins/jenkins_builds similarity index 100% rename from etc/munin/plugins/jenkins_builds rename to 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 similarity index 100% rename from etc/munin/plugins/jenkins_builds_results rename to 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 similarity index 100% rename from etc/munin/plugins/jenkins_builds_results_summary rename to 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 similarity index 100% rename from etc/munin/plugins/jenkins_builds_running rename to hosts/jenkins/etc/munin/plugins/jenkins_builds_running diff --git a/etc/munin/plugins/jenkins_jobs b/hosts/jenkins/etc/munin/plugins/jenkins_jobs similarity index 100% rename from etc/munin/plugins/jenkins_jobs rename to hosts/jenkins/etc/munin/plugins/jenkins_jobs diff --git a/etc/munin/plugins/munin_stats b/hosts/jenkins/etc/munin/plugins/munin_stats similarity index 100% rename from etc/munin/plugins/munin_stats rename to 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 similarity index 100% rename from etc/munin/static/style-new.css rename to 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 similarity index 100% rename from etc/munin/templates/partial/navigation.tmpl rename to hosts/jenkins/etc/munin/templates/partial/navigation.tmpl diff --git a/etc/nagios/check-libs.conf b/hosts/jenkins/etc/nagios/check-libs.conf similarity index 100% rename from etc/nagios/check-libs.conf rename to hosts/jenkins/etc/nagios/check-libs.conf diff --git a/etc/nagios/obsolete-packages-ignore b/hosts/jenkins/etc/nagios/obsolete-packages-ignore similarity index 100% rename from etc/nagios/obsolete-packages-ignore rename to 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 similarity index 100% rename from etc/pbuilder/rebuild-hooks/D01_modify_environment rename to hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment diff --git a/etc/pbuilderrc b/hosts/jenkins/etc/pbuilderrc similarity index 100% rename from etc/pbuilderrc rename to hosts/jenkins/etc/pbuilderrc diff --git a/etc/postfix/main.cf b/hosts/jenkins/etc/postfix/main.cf similarity index 100% rename from etc/postfix/main.cf rename to hosts/jenkins/etc/postfix/main.cf diff --git a/etc/rc.local b/hosts/jenkins/etc/rc.local similarity index 100% rename from etc/rc.local rename to hosts/jenkins/etc/rc.local diff --git a/etc/schroot/default/fstab b/hosts/jenkins/etc/schroot/default/fstab similarity index 100% rename from etc/schroot/default/fstab rename to hosts/jenkins/etc/schroot/default/fstab diff --git a/etc/schroot/default/nssdatabases b/hosts/jenkins/etc/schroot/default/nssdatabases similarity index 100% rename from etc/schroot/default/nssdatabases rename to hosts/jenkins/etc/schroot/default/nssdatabases diff --git a/etc/shorewall/interfaces b/hosts/jenkins/etc/shorewall/interfaces similarity index 100% rename from etc/shorewall/interfaces rename to hosts/jenkins/etc/shorewall/interfaces diff --git a/etc/shorewall/params b/hosts/jenkins/etc/shorewall/params similarity index 100% rename from etc/shorewall/params rename to hosts/jenkins/etc/shorewall/params diff --git a/etc/shorewall/policy b/hosts/jenkins/etc/shorewall/policy similarity index 100% rename from etc/shorewall/policy rename to hosts/jenkins/etc/shorewall/policy diff --git a/etc/shorewall/rules b/hosts/jenkins/etc/shorewall/rules similarity index 100% rename from etc/shorewall/rules rename to hosts/jenkins/etc/shorewall/rules diff --git a/etc/shorewall/shorewall.conf b/hosts/jenkins/etc/shorewall/shorewall.conf similarity index 100% rename from etc/shorewall/shorewall.conf rename to hosts/jenkins/etc/shorewall/shorewall.conf diff --git a/etc/shorewall/zones b/hosts/jenkins/etc/shorewall/zones similarity index 100% rename from etc/shorewall/zones rename to hosts/jenkins/etc/shorewall/zones diff --git a/etc/shorewall6/interfaces b/hosts/jenkins/etc/shorewall6/interfaces similarity index 100% rename from etc/shorewall6/interfaces rename to hosts/jenkins/etc/shorewall6/interfaces diff --git a/etc/shorewall6/params b/hosts/jenkins/etc/shorewall6/params similarity index 100% rename from etc/shorewall6/params rename to hosts/jenkins/etc/shorewall6/params diff --git a/etc/shorewall6/policy b/hosts/jenkins/etc/shorewall6/policy similarity index 100% rename from etc/shorewall6/policy rename to hosts/jenkins/etc/shorewall6/policy diff --git a/etc/shorewall6/rules b/hosts/jenkins/etc/shorewall6/rules similarity index 100% rename from etc/shorewall6/rules rename to hosts/jenkins/etc/shorewall6/rules diff --git a/etc/shorewall6/shorewall6.conf b/hosts/jenkins/etc/shorewall6/shorewall6.conf similarity index 100% rename from etc/shorewall6/shorewall6.conf rename to hosts/jenkins/etc/shorewall6/shorewall6.conf diff --git a/etc/shorewall6/zones b/hosts/jenkins/etc/shorewall6/zones similarity index 100% rename from etc/shorewall6/zones rename to hosts/jenkins/etc/shorewall6/zones diff --git a/etc/squid3/squid.conf b/hosts/jenkins/etc/squid3/squid.conf similarity index 100% rename from etc/squid3/squid.conf rename to hosts/jenkins/etc/squid3/squid.conf diff --git a/etc/sudoers.d/jenkins b/hosts/jenkins/etc/sudoers.d/jenkins similarity index 100% rename from etc/sudoers.d/jenkins rename to hosts/jenkins/etc/sudoers.d/jenkins diff --git a/etc/sudoers.d/jenkins-adm b/hosts/jenkins/etc/sudoers.d/jenkins-adm similarity index 100% rename from etc/sudoers.d/jenkins-adm rename to hosts/jenkins/etc/sudoers.d/jenkins-adm diff --git a/update_jdn.sh b/update_jdn.sh index 932e21e09..02e37c2a0 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 -- GitLab