Fix line endings

This commit is contained in:
Disassembler 2020-04-04 18:04:56 +02:00
parent cb4ff53efd
commit e7e255488d
No known key found for this signature in database
GPG Key ID: 524BD33A0EE29499
17 changed files with 107 additions and 107 deletions

@ -1 +1 @@
Subproject commit ffa0927119374532eda8a576438740039e7b42f5 Subproject commit 4e7921e85dfc7b66667ceb1d9a5da840a757a5a4

@ -1 +1 @@
Subproject commit cf629dc6d1343b4c8e0b7719d4e232979648fd6f Subproject commit 43f55e59172836e8f7a1390fac82a1070b4660c4

View File

@ -1,2 +1,2 @@
<?php <?php
echo $_SERVER['REMOTE_ADDR']; echo $_SERVER['REMOTE_ADDR'];

View File

@ -1 +1 @@
INSERT INTO public.user (id, name, apikey, created, about, password, fullname, email, reset_key, sysadmin, activity_streams_email_notifications, state) VALUES ('${CKAN_ADMIN_UUID}', '${CKAN_ADMIN_USER}', '${CKAN_ADMIN_APIKEY}', NOW(), NULL, '${CKAN_ADMIN_HASH}', NULL, '${CKAN_ADMIN_EMAIL}', NULL, TRUE, FALSE, 'active'); INSERT INTO public.user (id, name, apikey, created, about, password, fullname, email, reset_key, sysadmin, activity_streams_email_notifications, state) VALUES ('${CKAN_ADMIN_UUID}', '${CKAN_ADMIN_USER}', '${CKAN_ADMIN_APIKEY}', NOW(), NULL, '${CKAN_ADMIN_HASH}', NULL, '${CKAN_ADMIN_EMAIL}', NULL, TRUE, FALSE, 'active');

View File

@ -1,16 +1,16 @@
CREATE ROLE ckan NOSUPERUSER NOCREATEDB NOCREATEROLE NOINHERIT LOGIN ENCRYPTED PASSWORD '${CKAN_PWD}'; CREATE ROLE ckan NOSUPERUSER NOCREATEDB NOCREATEROLE NOINHERIT LOGIN ENCRYPTED PASSWORD '${CKAN_PWD}';
CREATE ROLE ckan_datastore NOSUPERUSER NOCREATEDB NOCREATEROLE NOINHERIT LOGIN ENCRYPTED PASSWORD '${CKAN_DS_PWD}'; CREATE ROLE ckan_datastore NOSUPERUSER NOCREATEDB NOCREATEROLE NOINHERIT LOGIN ENCRYPTED PASSWORD '${CKAN_DS_PWD}';
CREATE DATABASE ckan; CREATE DATABASE ckan;
REVOKE ALL ON DATABASE ckan FROM public; REVOKE ALL ON DATABASE ckan FROM public;
ALTER DATABASE ckan OWNER TO ckan; ALTER DATABASE ckan OWNER TO ckan;
CREATE DATABASE ckan_datastore; CREATE DATABASE ckan_datastore;
REVOKE ALL ON DATABASE ckan_datastore FROM public; REVOKE ALL ON DATABASE ckan_datastore FROM public;
GRANT CONNECT, CREATE, TEMPORARY ON DATABASE ckan_datastore TO ckan; GRANT CONNECT, CREATE, TEMPORARY ON DATABASE ckan_datastore TO ckan;
ALTER DATABASE ckan_datastore OWNER TO ckan_datastore; ALTER DATABASE ckan_datastore OWNER TO ckan_datastore;
\c ckan \c ckan
CREATE EXTENSION postgis; CREATE EXTENSION postgis;
GRANT ALL ON geometry_columns TO ckan; GRANT ALL ON geometry_columns TO ckan;
GRANT ALL ON spatial_ref_sys TO ckan; GRANT ALL ON spatial_ref_sys TO ckan;

View File

@ -1,2 +1,2 @@
production: production:
secret_key_base: ${CRISISCLEANUP_SECRET} secret_key_base: ${CRISISCLEANUP_SECRET}

View File

@ -34,7 +34,7 @@ RUN EOF
rm -rf /root/.cache rm -rf /root/.cache
EOF EOF
COPY lxc COPY image.d
ENV DJANGO_SETTINGS_MODULE cts.settings.spotter ENV DJANGO_SETTINGS_MODULE cts.settings.spotter
WORKDIR /srv/cts WORKDIR /srv/cts

View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
true | openssl s_client -connect host:443 | openssl x509 -out /usr/local/share/ca-certificates/host.crt true | openssl s_client -connect host:443 | openssl x509 -out /usr/local/share/ca-certificates/host.crt
update-ca-certificates update-ca-certificates

View File

@ -1 +1 @@
SIGINT SIGINT

View File

@ -1,47 +1,47 @@
../themes/default/layout.css ../themes/default/layout.css
../themes/default/xtheme-gray.css ../themes/default/xtheme-gray.css
../themes/default/footer.css ../themes/default/footer.css
../themes/default/widgets.css ../themes/default/widgets.css
../themes/default/shortcut.css ../themes/default/shortcut.css
../themes/default/homepage.css ../themes/default/homepage.css
font-awesome/font-awesome.css font-awesome/font-awesome.css
plugins/jquery.cluetip.css plugins/jquery.cluetip.css
plugins/jquery.dataTables.css plugins/jquery.dataTables.css
plugins/jquery.dataTables.responsive.css plugins/jquery.dataTables.responsive.css
plugins/jquery.tagit.css plugins/jquery.tagit.css
#ui/accordion.css #ui/accordion.css
ui/core.css ui/core.css
ui/autocomplete.css ui/autocomplete.css
ui/button.css ui/button.css
ui/datepicker.css ui/datepicker.css
ui/dialog.css ui/dialog.css
# Needed for Delphi # Needed for Delphi
ui/draggable.css ui/draggable.css
ui/menu.css ui/menu.css
#ui/progressbar.css #ui/progressbar.css
ui/resizable.css ui/resizable.css
ui/selectmenu.css ui/selectmenu.css
ui/slider.css ui/slider.css
#ui/sortable.css #ui/sortable.css
#ui/spinner.css #ui/spinner.css
ui/tabs.css ui/tabs.css
#ui/tooltip.css #ui/tooltip.css
ui/fgtimepicker.css ui/fgtimepicker.css
ui/multiselect.css ui/multiselect.css
ui/timepicker-addon.css ui/timepicker-addon.css
#calendars/ui-smoothness.calendars.picker.css #calendars/ui-smoothness.calendars.picker.css
../themes/foundation/jquery-ui.theme.css ../themes/foundation/jquery-ui.theme.css
gis/style.css gis/style.css
zocial/zocial.css zocial/zocial.css
../themes/default/gis.css ../themes/default/gis.css
../themes/foundation/map.css ../themes/foundation/map.css
../themes/default/mobile.css ../themes/default/mobile.css
../themes/default/print.css ../themes/default/print.css
d3/nv.d3.css d3/nv.d3.css
#../themes/default/project.css #../themes/default/project.css
../themes/default/report.css ../themes/default/report.css
../themes/default/survey.css ../themes/default/survey.css
../themes/default/newsfeed.css ../themes/default/newsfeed.css
../themes/default/theme.css ../themes/default/theme.css
#../themes/default/style.css #../themes/default/style.css
# Final line required for parsing # Final line required for parsing

View File

@ -1,30 +1,30 @@
Name,Comments Name,Comments
Capacity Development,"training and development, institutional strengthening, institutional learning" Capacity Development,"training and development, institutional strengthening, institutional learning"
Civil Society/NGOs,"civic action, collective community action, community-based organization (CBO) action, grassroots action, integrative DRR, non-governmental organization (NGO) action" Civil Society/NGOs,"civic action, collective community action, community-based organization (CBO) action, grassroots action, integrative DRR, non-governmental organization (NGO) action"
Climate Change,"adaptation to climate change, sustainable development" Climate Change,"adaptation to climate change, sustainable development"
Community-based DRR,"local knowledge, local risk mapping" Community-based DRR,"local knowledge, local risk mapping"
Complex Emergency,"multiple hazard crisis, humanitarian crisis, conflict" Complex Emergency,"multiple hazard crisis, humanitarian crisis, conflict"
Critical Infrastructure,"communications systems, health facilities, 'lifelines', power and energy, emergency evacuation shelters, financial infrastructure, schools, transportation, waste disposal, water supplies" Critical Infrastructure,"communications systems, health facilities, 'lifelines', power and energy, emergency evacuation shelters, financial infrastructure, schools, transportation, waste disposal, water supplies"
Disaster Risk Management,"civil protection, contingency and emergency planning, early recovery, preparedness" Disaster Risk Management,"civil protection, contingency and emergency planning, early recovery, preparedness"
Early Warning,"risk knowledge, monitoring and warning service, risk communication, response capability, disaster preparedness, risk modelling" Early Warning,"risk knowledge, monitoring and warning service, risk communication, response capability, disaster preparedness, risk modelling"
Economics of DRR,"cost benefit analysis, disaster risk financing, financial effects of disasters, poverty and disaster risk, risk sharing, socio-economic impacts of disasters" Economics of DRR,"cost benefit analysis, disaster risk financing, financial effects of disasters, poverty and disaster risk, risk sharing, socio-economic impacts of disasters"
Education & School Safety,"learning, safe schools" Education & School Safety,"learning, safe schools"
Environment,"sustainable development, environmental degradation, ecosystems and environmental management" Environment,"sustainable development, environmental degradation, ecosystems and environmental management"
Food Security & Agriculture,"cost benefit analysis, disaster risk financing, financial effects of disasters, poverty and disaster risk, risk sharing, socio-economic impacts of disasterscost benefit analysis, disaster risk financing, financial effects of disasters, poverty and disaster risk, risk sharing, socio-economic impacts of disasters" Food Security & Agriculture,"cost benefit analysis, disaster risk financing, financial effects of disasters, poverty and disaster risk, risk sharing, socio-economic impacts of disasterscost benefit analysis, disaster risk financing, financial effects of disasters, poverty and disaster risk, risk sharing, socio-economic impacts of disasters"
Gender,"gendered vulnerability, gender-sensitive disaster risk management" Gender,"gendered vulnerability, gender-sensitive disaster risk management"
GIS & Mapping,"geographic information systems, hazard exposure mapping, vulnerability mapping, risk mapping" GIS & Mapping,"geographic information systems, hazard exposure mapping, vulnerability mapping, risk mapping"
Governance,"disaster risk reduction policy and legislation, National Platform for disaster risk reduction, Regional Platforms for disaster risk reduction" Governance,"disaster risk reduction policy and legislation, National Platform for disaster risk reduction, Regional Platforms for disaster risk reduction"
Health & Health Facilities,"capacity of health practitioners, mental health" Health & Health Facilities,"capacity of health practitioners, mental health"
Indigenous Knowledge,"indigenous early warning system, local adaptation for implementation, local knowledge, local skills, local technical knowledge, local knowledge systems, traditional knowledge, transferable indigenous knowledge; related: coastal zones, food security and agricultural practice, housing, mountain ecosystems, river basin management, water management" Indigenous Knowledge,"indigenous early warning system, local adaptation for implementation, local knowledge, local skills, local technical knowledge, local knowledge systems, traditional knowledge, transferable indigenous knowledge; related: coastal zones, food security and agricultural practice, housing, mountain ecosystems, river basin management, water management"
Information Management,"disaster databases, disaster information, disaster risk information portals, ICT" Information Management,"disaster databases, disaster information, disaster risk information portals, ICT"
Media,"disaster reporting, disaster information dissemination" Media,"disaster reporting, disaster information dissemination"
Private-public Partnerships,"corporate social responsibility, private sector engagement in DRR" Private-public Partnerships,"corporate social responsibility, private sector engagement in DRR"
Recovery,"building back better, long-term recovery and reconstruction, rehabilitation, shelter" Recovery,"building back better, long-term recovery and reconstruction, rehabilitation, shelter"
Risk Identification & Assessment,"risk assessment, loss data, disaster risk management" Risk Identification & Assessment,"risk assessment, loss data, disaster risk management"
Risk Transfer & Insurance,"disaster insurance, contingency funding, micro-insurance, post-disaster loans, risk financing, risk insurance, risk sharing, pooling" Risk Transfer & Insurance,"disaster insurance, contingency funding, micro-insurance, post-disaster loans, risk financing, risk insurance, risk sharing, pooling"
Social Impacts & Resilience,"coping capacity, loss absorption, loss acceptance, psychosocial support, social vulnerability, trauma prevention" Social Impacts & Resilience,"coping capacity, loss absorption, loss acceptance, psychosocial support, social vulnerability, trauma prevention"
Space Technology,satellite disaster imagery Space Technology,satellite disaster imagery
Structural Safety,"building codes, building standards, building materials, construction, retrofitting" Structural Safety,"building codes, building standards, building materials, construction, retrofitting"
Urban Risk & Planning,"urban planning, urban management" Urban Risk & Planning,"urban planning, urban management"
Vulnerable Populations,"at-risk populations, including: children, orphans, disabled, elderly, homeless, hospitalized people, illegal immigrants, illiterate, medically or chemically dependent, impoverished populations, migrants, Person With Disabilities (PWDs), speakers of non-local languages" Vulnerable Populations,"at-risk populations, including: children, orphans, disabled, elderly, homeless, hospitalized people, illegal immigrants, illiterate, medically or chemically dependent, impoverished populations, migrants, Person With Disabilities (PWDs), speakers of non-local languages"
Water,"drinking water, freshwater, irrigation, potable water, water and sanitation, water resource management" Water,"drinking water, freshwater, irrigation, potable water, water and sanitation, water resource management"
1 Name Comments
2 Capacity Development training and development, institutional strengthening, institutional learning
3 Civil Society/NGOs civic action, collective community action, community-based organization (CBO) action, grassroots action, integrative DRR, non-governmental organization (NGO) action
4 Climate Change adaptation to climate change, sustainable development
5 Community-based DRR local knowledge, local risk mapping
6 Complex Emergency multiple hazard crisis, humanitarian crisis, conflict
7 Critical Infrastructure communications systems, health facilities, 'lifelines', power and energy, emergency evacuation shelters, financial infrastructure, schools, transportation, waste disposal, water supplies
8 Disaster Risk Management civil protection, contingency and emergency planning, early recovery, preparedness
9 Early Warning risk knowledge, monitoring and warning service, risk communication, response capability, disaster preparedness, risk modelling
10 Economics of DRR cost benefit analysis, disaster risk financing, financial effects of disasters, poverty and disaster risk, risk sharing, socio-economic impacts of disasters
11 Education & School Safety learning, safe schools
12 Environment sustainable development, environmental degradation, ecosystems and environmental management
13 Food Security & Agriculture cost benefit analysis, disaster risk financing, financial effects of disasters, poverty and disaster risk, risk sharing, socio-economic impacts of disasterscost benefit analysis, disaster risk financing, financial effects of disasters, poverty and disaster risk, risk sharing, socio-economic impacts of disasters
14 Gender gendered vulnerability, gender-sensitive disaster risk management
15 GIS & Mapping geographic information systems, hazard exposure mapping, vulnerability mapping, risk mapping
16 Governance disaster risk reduction policy and legislation, National Platform for disaster risk reduction, Regional Platforms for disaster risk reduction
17 Health & Health Facilities capacity of health practitioners, mental health
18 Indigenous Knowledge indigenous early warning system, local adaptation for implementation, local knowledge, local skills, local technical knowledge, local knowledge systems, traditional knowledge, transferable indigenous knowledge; related: coastal zones, food security and agricultural practice, housing, mountain ecosystems, river basin management, water management
19 Information Management disaster databases, disaster information, disaster risk information portals, ICT
20 Media disaster reporting, disaster information dissemination
21 Private-public Partnerships corporate social responsibility, private sector engagement in DRR
22 Recovery building back better, long-term recovery and reconstruction, rehabilitation, shelter
23 Risk Identification & Assessment risk assessment, loss data, disaster risk management
24 Risk Transfer & Insurance disaster insurance, contingency funding, micro-insurance, post-disaster loans, risk financing, risk insurance, risk sharing, pooling
25 Social Impacts & Resilience coping capacity, loss absorption, loss acceptance, psychosocial support, social vulnerability, trauma prevention
26 Space Technology satellite disaster imagery
27 Structural Safety building codes, building standards, building materials, construction, retrofitting
28 Urban Risk & Planning urban planning, urban management
29 Vulnerable Populations at-risk populations, including: children, orphans, disabled, elderly, homeless, hospitalized people, illegal immigrants, illiterate, medically or chemically dependent, impoverished populations, migrants, Person With Disabilities (PWDs), speakers of non-local languages
30 Water drinking water, freshwater, irrigation, potable water, water and sanitation, water resource management