Skip to content
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

Jump to bottom

Fixes #7927: Remove .cf files from initial promises #1003

Merged
merged 1 commit into from
Aug 4, 2016
Merged

Fixes #7927: Remove .cf files from initial promises #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
106 changes: 30 additions & 76 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,90 +19,44 @@
WGET := $(if $(PROXY), http_proxy=$(PROXY) ftp_proxy=$(PROXY)) /usr/bin/wget -q

all: rudder-templates-cli.jar
cp techniques/system/common/1.0/rudder-stdlib.cf initial-promises/node-server/common/1.0/
# The common technique
sed -i -e 's/.*TRACKINGKEY.*/ "TRACKINGKEY": "hasPolicyServer-root@@common-root@@00",/' variables.json
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/common/1.0/ techniques/system/common/1.0/rudder-stdlib-core.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/common/1.0/ techniques/system/common/1.0/cf-served.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/common/1.0/ techniques/system/common/1.0/internal_security.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/common/1.0/ techniques/system/common/1.0/rudder_lib.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/common/1.0/ techniques/system/common/1.0/site.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/common/1.0/ techniques/system/common/1.0/cron_setup.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/common/1.0 techniques/system/common/1.0/update.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server techniques/system/common/1.0/failsafe.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/common/1.0/ techniques/system/common/1.0/rudder_system_directives.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/common/1.0/ techniques/system/common/1.0/rudder_directives.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server techniques/system/common/1.0/promises.st
java -jar rudder-templates-cli.jar --outext '' --outdir initial-promises/node-server/common/cron techniques/system/common/1.0/rudder_agent_community_cron.st
java -jar rudder-templates-cli.jar --outext '' --outdir initial-promises/node-server/common/cron techniques/system/common/1.0/rudder_agent_nova_cron.st
java -jar rudder-templates-cli.jar --outext '' --outdir initial-promises/node-server techniques/system/common/1.0/run_interval.st
java -jar rudder-templates-cli.jar --outext '' --outdir initial-promises/node-server/common/utilities techniques/system/common/1.0/minicurl.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/common/1.0/ techniques/system/common/1.0/*.st
cp techniques/system/common/1.0/*.cf initial-promises/node-server/common/1.0/ || true
mv initial-promises/node-server/common/1.0/failsafe.cf initial-promises/node-server/
mv initial-promises/node-server/common/1.0/promises.cf initial-promises/node-server/
mkdir -p initial-promises/node-server/common/cron
cp techniques/system/common/1.0/rudder-agent-community-cron initial-promises/node-server/common/cron/
cp techniques/system/common/1.0/rudder-agent-nova-cron initial-promises/node-server/common/cron/
mv initial-promises/node-server/common/1.0/run-interval.cf initial-promises/node-server/run-interval
mkdir -p initial-promises/node-server/common/utilities
cp techniques/system/common/1.0/minicurl initial-promises/node-server/common/utilities/
chmod +x initial-promises/node-server/common/utilities/minicurl
# The inventory technique
sed -i -e 's/.*TRACKINGKEY.*/ "TRACKINGKEY": "inventory-all@@inventory-all@@00",/' variables.json
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/inventory/1.0 techniques/system/inventory/1.0/virtualMachines.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/inventory/1.0 techniques/system/inventory/1.0/fetchFusionTools.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/inventory/1.0 techniques/system/inventory/1.0/fusionAgent.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/inventory/1.0/ techniques/system/inventory/1.0/*.st
cp techniques/system/inventory/1.0/*.cf initial-promises/node-server/inventory/1.0/ || true
# The distributePolicy technique
sed -i -e 's/.*TRACKINGKEY.*/ "TRACKINGKEY": "root-DP@@root-distributePolicy@@00",/' variables.json
cp techniques/system/distributePolicy/1.0/rudder-ncf-conf.st initial-promises/node-server/distributePolicy/ncf/ncf.conf
java -jar rudder-templates-cli.jar --outext .conf --outdir initial-promises/node-server/distributePolicy/rsyslog.conf techniques/system/distributePolicy/1.0/rudder-rsyslog-root.st
java -jar rudder-templates-cli.jar --outext .conf --outdir initial-promises/node-server/distributePolicy/rsyslog.conf techniques/system/distributePolicy/1.0/rudder-rsyslog-relay.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/distributePolicy/1.0 techniques/system/distributePolicy/1.0/rsyslogConf.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/distributePolicy/1.0 techniques/system/distributePolicy/1.0/propagatePromises.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/distributePolicy/1.0/ techniques/system/distributePolicy/1.0/*.st
cp techniques/system/distributePolicy/1.0/*.cf initial-promises/node-server/distributePolicy/1.0/ || true
mkdir -p initial-promises/node-server/distributePolicy/ncf
cp techniques/system/distributePolicy/1.0/rudder-ncf-conf initial-promises/node-server/distributePolicy/ncf/
mkdir -p initial-promises/node-server/distributePolicy/rsyslog.conf
mv initial-promises/node-server/distributePolicy/1.0/rudder-rsyslog-root.cf initial-promises/node-server/distributePolicy/rsyslog.conf/rudder-rsyslog-root
mv initial-promises/node-server/distributePolicy/1.0/rudder-rsyslog-relay.cf initial-promises/node-server/distributePolicy/rsyslog.conf/rudder-rsyslog-relay
# The server-roles technique
sed -i -e 's/.*TRACKINGKEY.*/ "TRACKINGKEY": "server-roles@@server-roles-directive@@0",/' variables.json
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/server-roles/1.0 techniques/system/server-roles/1.0/alive-check.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/server-roles/1.0 techniques/system/server-roles/1.0/component-check.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/server-roles/1.0 techniques/system/server-roles/1.0/compress-webapp-log.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/server-roles/1.0 techniques/system/server-roles/1.0/integrity-check.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/server-roles/1.0 techniques/system/server-roles/1.0/logrotate-check.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/server-roles/1.0 techniques/system/server-roles/1.0/metrics-reporting.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/server-roles/1.0 techniques/system/server-roles/1.0/network-check.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/server-roles/1.0 techniques/system/server-roles/1.0/password-check.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/server-roles/1.0 techniques/system/server-roles/1.0/postgres-check.st
cp techniques/system/server-roles/1.0/rudder-logrotate.st initial-promises/node-server/server-roles/logrotate.conf/rudder
java -jar rudder-templates-cli.jar --outext .conf --outdir initial-promises/node-server techniques/system/server-roles/1.0/rudder-server-roles.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/server-roles/1.0 techniques/system/server-roles/1.0/servers-by-role.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/server-roles/1.0 techniques/system/server-roles/1.0/service-check.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/server-roles/1.0 techniques/system/server-roles/1.0/technique-reload.st
java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/server-roles/1.0/ techniques/system/server-roles/1.0/*.st
cp techniques/system/server-roles/1.0/*.cf initial-promises/node-server/server-roles/1.0/ || true
mkdir -p initial-promises/node-server/server-roles/logrotate.conf/
cp techniques/system/server-roles/1.0/rudder-logrotate initial-promises/node-server/server-roles/logrotate.conf/rudder
mv initial-promises/node-server/server-roles/1.0/rudder-server-roles.cf initial-promises/node-server/rudder-server-roles.conf
# Bring variables.json back to its initial state
sed -i -e 's/.*TRACKINGKEY.*/ "TRACKINGKEY": "root-DP@@root-distributePolicy@@00",/' variables.json

rudder-templates-cli.jar:
$(WGET) -O rudder-templates-cli.jar http://www.normation.com/tarball/rudder-templates-cli/rudder-templates-cli.jar

clean:
rm -f initial-promises/node-server/common/1.0/rudder-stdlib.cf
rm -f initial-promises/node-server/common/1.0/rudder-stdlib-core.cf
rm -f initial-promises/node-server/common/1.0/cf-served.cf
rm -f initial-promises/node-server/common/1.0/internal_security.cf
rm -f initial-promises/node-server/common/1.0/rudder_lib.cf
rm -f initial-promises/node-server/common/1.0/site.cf
rm -f initial-promises/node-server/common/1.0/update.cf
rm -f initial-promises/node-server/failsafe.cf
rm -f initial-promises/node-server/common/1.0/cron_setup.cf
rm -f initial-promises/node-server/common/1.0/rudder_system_directives.cf
rm -f initial-promises/node-server/common/1.0/rudder_directives.cf
rm -f initial-promises/node-server/promises.cf
rm -f initial-promises/node-server/common/cron/rudder_agent_community_cron
rm -f initial-promises/node-server/common/cron/rudder_agent_nova_cron
rm -f initial-promises/node-server/common/utilities/minicurl
rm -f initial-promises/node-server/inventory/1.0/virtualMachines.cf
rm -f initial-promises/node-server/inventory/1.0/fetchFusionTools.cf
rm -f initial-promises/node-server/inventory/1.0/fusionAgent.cf
rm -f initial-promises/node-server/distributePolicy/ncf/ncf.conf
rm -f initial-promises/node-server/distributePolicy/rsyslog.conf/rudder-rsyslog-root.conf
rm -f initial-promises/node-server/distributePolicy/rsyslog.conf/rudder-rsyslog-relay.conf
rm -f initial-promises/node-server/distributePolicy/1.0/rsyslogConf.cf
rm -f initial-promises/node-server/distributePolicy/1.0/propagatePromises.cf
rm -f initial-promises/node-server/server-roles/1.0/alive-check.cf
rm -f initial-promises/node-server/server-roles/1.0/component-check.cf
rm -f initial-promises/node-server/server-roles/1.0/compress-webapp-log.cf
rm -f initial-promises/node-server/server-roles/1.0/integrity-check.cf
rm -f initial-promises/node-server/server-roles/1.0/logrotate-check.cf
rm -f initial-promises/node-server/server-roles/1.0/metrics-reporting.cf
rm -f initial-promises/node-server/server-roles/1.0/network-check.cf
rm -f initial-promises/node-server/server-roles/1.0/password-check.cf
rm -f initial-promises/node-server/server-roles/1.0/postgres-check.cf
rm -f initial-promises/node-server/server-roles/logrotate.conf/rudder
rm -f initial-promises/node-server/rudder-server-roles.conf
rm -f initial-promises/node-server/server-roles/1.0/servers-by-role.cf
rm -f initial-promises/node-server/server-roles/1.0/service-check.cf
rm -f initial-promises/node-server/server-roles/1.0/technique-reload.cf
rm -f initial-promises/node-server/run_interval
rm -rf initial-promises/
206 changes: 0 additions & 206 deletions initial-promises/node-server/common/1.0/cf-served.cf
View file
Open in desktop

This file was deleted.