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.

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

Fix white-space issues #42

Merged
merged 2 commits into from Dec 5, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion features/cvmfs/client-cleanup.pan
Expand Up @@ -60,7 +60,7 @@ variable CVMFS_CLIENT_CLEANUP_QUOTA ?= {
#
variable cron_command = {
this = 'sleep $[ $RANDOM \% ' + to_string(CVMFS_CLIENT_CLEANUP_CRON_SLEEP) + ' ]s;'
+ 'flock -n /var/lock/cvmfs_client_cleanup.lock '
+ 'flock -n /var/lock/cvmfs_client_cleanup.lock '
+ CVMFS_CLIENT_CLEANUP_SCRIPT + ' '
+ to_string(CVMFS_CLIENT_CLEANUP_QUOTA) + ' '
+ to_string(CVMFS_CLIENT_CLEANUP_THRESHOLD) + ' '
Expand Down
2 changes: 1 addition & 1 deletion features/cvmfs/config.pan
@@ -1,7 +1,7 @@
unique template features/cvmfs/config;

variable CVMFS_CLIENT_ENABLED ?= false;
include {
include {
if ((is_boolean(CVMFS_CLIENT_ENABLED) && CVMFS_CLIENT_ENABLED)) {
'features/cvmfs/client';
};
Expand Down
18 changes: 9 additions & 9 deletions features/fetch-crl/config.pan
Expand Up @@ -16,9 +16,9 @@ include { 'features/fetch-crl/rpms' + RPMS_CONFIG_SUFFIX };
# Define fetch-crl version if not defined when adding RPMs
variable FETCH_CRL_VERSION ?= '3.0';

# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
# fetch-crl configuration
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
include { 'components/sysconfig/config' };
"/software/components/sysconfig/files/fetch-crl/CRLDIR" = SITE_DEF_CERTDIR;
"/software/components/sysconfig/files/fetch-crl/FORCE_OVERWRITE" = if ( FETCH_CRL_FORCE_OVERWRITE ) {
Expand All @@ -32,9 +32,9 @@ include { 'components/sysconfig/config' };
'no';
};

# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
# cron
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
include { 'components/cron/config' };
"/software/components/cron/entries" = {
if (FETCH_CRL_VERSION < '3.0') {
Expand All @@ -54,10 +54,10 @@ include { 'components/cron/config' };
};


# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
# altlogrotate
# ----------------------------------------------------------------------------
include { 'components/altlogrotate/config' };
# ----------------------------------------------------------------------------
include { 'components/altlogrotate/config' };
"/software/components/altlogrotate/entries" = {
if (FETCH_CRL_VERSION < '3.0') {
SELF['fetch-crl-cron'] = nlist("pattern", "/var/log/fetch-crl-cron.ncm-cron.log",
Expand All @@ -78,9 +78,9 @@ include { 'components/altlogrotate/config' };
};


# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
# chkconfig
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
"/software/components/chkconfig/service" = {
if (FETCH_CRL_VERSION >= '3.0') {
# Run fetch-crl on boot
Expand Down
2 changes: 1 addition & 1 deletion features/fetch-crl/rpms.pan
Expand Up @@ -12,7 +12,7 @@ variable FETCH_CRL_VERSION ?= {
'2.7.0-2';
};
};

'/software/packages' = {
debug(FULL_HOSTNAME+': adding fetch-crl version '+FETCH_CRL_VERSION+' (OS:'+OS_VERSION_PARAMS['major']+', RPM name:'+FETCH_CRL_RPM_NAME+')');
pkg_repl(FETCH_CRL_RPM_NAME, FETCH_CRL_VERSION, 'noarch');
Expand Down
4 changes: 2 additions & 2 deletions features/frontier/services.pan
Expand Up @@ -26,13 +26,13 @@ variable FRONTIER_HOST_MONITOR_STRING ?= {
};

include { 'components/filecopy/config' };
'/software/components/filecopy/services/{/etc/squid/customized.sh}' =
'/software/components/filecopy/services/{/etc/squid/customized.sh}' =
nlist('config',format(file_contents('features/frontier/customized.sh.file'),
FRONTIER_LOCAL_NET_STRING,
FRONTIER_HOST_MONITOR_STRING,
FRONTIER_CACHE_MEM,
FRONTIER_CACHE_DIR,
),
),
'restart','service frontier-squid reload',
'perms','0644');

Expand Down
2 changes: 1 addition & 1 deletion features/pakiti/client/config.pan
Expand Up @@ -14,7 +14,7 @@ variable pakiti_conf = pakiti_conf + format("tag = %s\n", PAKITI_TAG);
variable PAKITI_CLIENT_INSECURE ?= false;
variable PAKITI_CLIENT_CONF ?= '/etc/pakiti2/pakiti2-client.conf';
variable pakiti_conf = if (is_boolean(PAKITI_CLIENT_INSECURE) && PAKITI_CLIENT_INSECURE ) {
SELF + "curl_path = /usr/bin/curl --insecure\n";
SELF + "curl_path = /usr/bin/curl --insecure\n";
} else {
SELF;
};
Expand Down
8 changes: 4 additions & 4 deletions features/pakiti/config.pan
Expand Up @@ -12,31 +12,31 @@ required = no
variable PAKITI_CA_PATH ?= SITE_DEF_CERTDIR;

@{
desc = Pakiti server host name
desc = Pakiti server host name
values = host name FQDN
default = none
required = yes
}
variable PAKITI_SERVER ?= error('PAKITI_SERVER variable undefined: no default');

@{
desc = Pakiti port on server
desc = Pakiti port on server
values = port number
default = 443
required = no
}
variable PAKITI_SERVER_PORT ?= 443;

@{
desc = Pakiti tag to used for this machine
desc = Pakiti tag to used for this machine
values = string
default = none
required = no
}
variable PAKITI_TAG ?= 'none';

@{
desc = Pakiti feed URL on the server
desc = Pakiti feed URL on the server
values = URL (host specific part)
default = /feed
required = no
Expand Down
14 changes: 7 additions & 7 deletions features/pakiti/server.pan
Expand Up @@ -16,31 +16,31 @@ variable PAKITI_TITLE ?= if ( is_defined(SITE_NAME) ) {


@{
desc = Pakiti database host name
desc = Pakiti database host name
values = string
default = pakiti
required = no
}
variable PAKITI_DB_NAME ?= 'pakiti';

@{
desc = Pakiti database server name
desc = Pakiti database server name
values = host name
default = localhost
required = no
}
variable PAKITI_DB_HOST ?= 'localhost';

@{
desc = Pakiti database user name
desc = Pakiti database user name
values = string
default = pakiti
required = no
}
variable PAKITI_DB_USER ?= 'pakiti';

@{
desc = Pakiti database user password
desc = Pakiti database user password
values = string
default = none
required = yes
Expand Down Expand Up @@ -174,9 +174,9 @@ include { 'components/symlink/config' };
"replace", nlist("all","yes","link", "yes")
)
);
##


##
##Pakiti Server config
##

Expand Down
2 changes: 1 addition & 1 deletion features/proof/config.pan
Expand Up @@ -113,7 +113,7 @@ start() {
}

stop() {
[ ! -f /var/lock/subsys/xrootd ] && return 0 || true
[ ! -f /var/lock/subsys/xrootd ] && return 0 || true
echo -n $"Stopping $prog: "
killproc xrootd
RETVAL=$?
Expand Down
2 changes: 1 addition & 1 deletion features/proof/xrootd-config-default.pan
Expand Up @@ -13,7 +13,7 @@ xrd.protocol xproofd:1093 libXrdProofd.so
fi
xpd.workdir PROOF_SANDBOX_AREA

xpd.role worker
xpd.role worker

EOF

2 changes: 1 addition & 1 deletion features/webserver-apache/config/default-vhost.pan
@@ -1,6 +1,6 @@
unique template features/webserver-apache/config/default-vhost;

variable DEFAULT_VHOST_CONFIG = {
variable DEFAULT_VHOST_CONFIG = {
if (index("ssl",WEB_SERVER_MODULES) != -1 ) {
config = "NameVirtualHost SERVERIP:80 \n\
NameVirtualHost SERVERIP:443 \n\
Expand Down
8 changes: 4 additions & 4 deletions features/webserver-apache/service.pan
Expand Up @@ -36,11 +36,11 @@ include {'components/filecopy/config'};
return(web_apps);
};

# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
# chkconfig
# Ensure httpd is running.
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
include { 'components/chkconfig/config' };

"/software/components/chkconfig/service/httpd/on" = "";
"/software/components/chkconfig/service/httpd/startstop" = true;
"/software/components/chkconfig/service/httpd/on" = "";
"/software/components/chkconfig/service/httpd/startstop" = true;